Changes to make proper module and simplify namespace.