[WIP] Converted Blocks module to namespace