Move Controller to appropriate folder