Refactor namespaces. Make modules and quasi imports visible