First cleanup tmp commit
tmp
Lots of restructuring
Fix hyphens