First code cleanup

Renamed module admins to controls, and a lot of code cleanup.
Left the properties for the json objects, didn't want to break the json
files.