Cleanup around controllers
Some package scope classes
Tiny refactorings