move things around to their proper places
keep some old files around for reference (to delete later)