Restructured to Minecraft format