Reorganize reusable code; add cobblestone, stone bricks, diamond ore, diamond block