Armory Expansion

Full configuration support;
Renamed fields to make it easier to read the JSON files;