Moved classes to proper packages.
Added functionality to unified preferences.
Removed unused imports.
Merged preference functionality.