moving things around and renaming