namespace refactor + project relocation