Moved controller classes to controller package