Re-organised solution in prep for NuGet package