Build 0.1.21 - Code reorg