Build 0.0.37 - Code reorg