codebase reorganized