Moved to 1.2.3-dev

Moved controllers to separate folders, more cleanup and some general
tweaks