Renamed some controller classes
Improved setting handling
Added unit tests