Move ctrls, services etc. in seperate files. #117