Reorganized Solution files into more task-oriented namespaces.