Rearranged solution

Still getting build errors fixed. Then will have to rename classes and
namespaces