Refactored namespace/module/naming stuff