restructure namespace.