move files around
getting there
reorg
fix up tool