cleaning up and renaming
moving dir