0.7.x namespace refactor