Refactoring the block and model classes. Removing subclasses for markups.