Restructured solution folders and namespaces

reorganized the solution as we discussed this morning