Refactoring controller package

Changed controller organization into a different package layout, would like feedback and ideas if this layout is prefered