restructure namespace