Lots of controller updates
Updates for file paths etc