Reworking StructureUpgrade and its TileEntities