Moved controller files to the correct directory