File reorg

Reorg files to make it easier to deploy