Moving files to clean up code