modular: Refactored the modules to break out the blocks from the common module