folder and namespace restructure