Moving files around and clean up