Moved new controllers into right place