reorganized directory structure as codebase grows