reorganization work to try to make sense of namespaces (to closer match folder structure in the project).