Loader: clean up controllers a bit
Loader: clean up controllers a bit

fp7-netide/Engine,pablomuri/Engine,fp7-netide/Engine,fp7-netide/Engine,pablomuri/Engine,fp7-netide/Engine,fp7-netide/Engine,pablomuri/Engine