Simplified the Block module namespace.