Moving around files to avoid confusion