clean up
Rearrange files
Remove old stuff