Additional service reorganisation for nuget package setup.
Improved 'setup' navigation.