Revert "move controller include - should fix #52 (but needs user testing..)"

This reverts commit c1c7d7b73efe59dd0f8c428089d04304f1c870c4.
fix #52 & #54 .. plz test