diff --git a/ModelCompilerUI/App.config b/ModelCompilerUI/App.config
index 27d6baed..6e4de807 100644
--- a/ModelCompilerUI/App.config
+++ b/ModelCompilerUI/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/ModelCompilerUI/ModelCompilerUI.csproj b/ModelCompilerUI/ModelCompilerUI.csproj
index a0099e87..2a9e25bd 100644
--- a/ModelCompilerUI/ModelCompilerUI.csproj
+++ b/ModelCompilerUI/ModelCompilerUI.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>OOI.ModelCompilerUI</RootNamespace>
     <AssemblyName>OOI.ModelCompilerUI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -112,6 +112,8 @@
     <Compile Include="ModelCompilerAPI.cs" />
     <Compile Include="ModelCompilerAPIInternal.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Schemas\XmlSchemaValidator.cs" />
+    <Compile Include="StackGenerator.cs" />
     <Compile Include="ToForms\GUIHandling.cs" />
     <Compile Include="ToForms\IGUIHandling.cs" />
     <Compile Include="ToForms\ToFormsConverters.cs" />
diff --git a/Opc.Ua.ModelCompiler/Schemas/XmlSchemaValidator.cs b/ModelCompilerUI/Schemas/XmlSchemaValidator.cs
similarity index 100%
rename from Opc.Ua.ModelCompiler/Schemas/XmlSchemaValidator.cs
rename to ModelCompilerUI/Schemas/XmlSchemaValidator.cs
diff --git a/Opc.Ua.ModelCompiler/StackGenerator.cs b/ModelCompilerUI/StackGenerator.cs
similarity index 100%
rename from Opc.Ua.ModelCompiler/StackGenerator.cs
rename to ModelCompilerUI/StackGenerator.cs
diff --git a/ModelCompilerUI/packages.config b/ModelCompilerUI/packages.config
index 1c35e020..378e2a92 100755
--- a/ModelCompilerUI/packages.config
+++ b/ModelCompilerUI/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="OPCFoundation.NetStandard.Opc.Ua.Core" version="1.4.367.41" targetFramework="net461" />
-  <package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.4.367.41" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Core" version="1.4.367.41" targetFramework="net461" requireReinstallation="true" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.4.367.41" targetFramework="net461" requireReinstallation="true" />
   <package id="Portable.BouncyCastle" version="1.8.10" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
@@ -11,5 +11,5 @@
   <package id="System.Net.NameResolution" version="4.3.0" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/DemoModel/DemoModel.DataTypes.cs b/Tests/DemoModel/DemoModel.DataTypes.cs
index b8bd3fc1..7e84a4c5 100644
--- a/Tests/DemoModel/DemoModel.DataTypes.cs
+++ b/Tests/DemoModel/DemoModel.DataTypes.cs
@@ -1060,7 +1060,7 @@ public override bool IsEqual(IEncodeable encodeable)
 
         #if !NET_STANDARD
         /// <summary cref="ICloneable.Clone" />
-        public object Clone()
+        public override object Clone()
         {
             return (SampleUnion)this.MemberwiseClone();
         }
@@ -1571,7 +1571,7 @@ public override bool IsEqual(IEncodeable encodeable)
 
         #if !NET_STANDARD
         /// <summary cref="ICloneable.Clone" />
-        public object Clone()
+        public override object Clone()
         {
             return (SampleUnionAllowSubtypes)this.MemberwiseClone();
         }
diff --git a/Tests/DemoModel/DemoModel.csproj b/Tests/DemoModel/DemoModel.csproj
index 5916bcc7..03bb0f6a 100644
--- a/Tests/DemoModel/DemoModel.csproj
+++ b/Tests/DemoModel/DemoModel.csproj
@@ -2,18 +2,20 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>DemoModel</AssemblyName>
+    <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
     <RootNamespace>DemoModel</RootNamespace>
-    <Version>2.1.0</Version>
+    <RootNamespace>ModelCompiler</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\build\bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>..\build\obj\$(Configuration)\UaBase\</IntermediateOutputPath>
+    <OutputPath>$(SolutionDir)build\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
+    <DefineConstants>NET_STANDARD</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>$(SolutionDir)build\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
     <DefineConstants>TRACE;NET_STANDARD</DefineConstants>
   </PropertyGroup>