Re-organizing to support service client code in separate folder/sln.