Dropped BlockFactory, changes to Block and BlockType