some moving and pruning
rename files
move stuff
move stuff more