rearrange
Remove unused files
bah