Build 1.0.49 - Code reorg