Moved cms into their own solution folders