Restructured solutions

Projects needed to be separated into different solutions because of
version conflicts between local project references and nuget packages.