Move Controller to dev-build