Move controllers
Merge pull request #70 from pmorie/deploy-trigger-wip

Move controllers