Cleanup, moving and renaming.