Project reorg + tests