Simplify namespace and directory structure.