move Controller to appropriate folder