Reorg
Added test project