more moving of files

more cleanup
moving more files around