update assemblyname to match restructure (and fix XAML)