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