Restructuring nuget solution