Minor tweaks to the statics in Main and the injection in Preferences.

Change-Id: Ibb815be499563b43d5b611aa311cb229be07f81a
Renamed the package contents so that there was a little less confusion
(PropertiesPreferences vs PreferencesProperties, etc)

Change-Id: I8780254b12461383ef73dcfa0a4c7229eda3177a