Initial Commit
Cleanup and reorg