Fungus2 code reorg