Moved controller classes into the controller subfolder.