Reorg

Reorg to better suit proper project structure