Prepping Marvin for submission

renamed folders, cleared old_version backup folder.