ome refactoring to include a namespace for the modules