Build 0.8.55 - Code reorg