0.90 Reorg & compile