Build 0.5.26 - Code reorg