Moved Blocks to new class