diff --git a/CSharpMath.Forms.Example.WPF/App.config b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.config
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/App.config
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.config
diff --git a/CSharpMath.Forms.Example.WPF/App.xaml b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.xaml
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/App.xaml
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.xaml
diff --git a/CSharpMath.Forms.Example.WPF/App.xaml.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.xaml.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/App.xaml.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/App.xaml.cs
diff --git a/CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj
similarity index 99%
rename from CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj
index 41449105..67dc32c0 100644
--- a/CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj
+++ b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/CSharpMath.Forms.Example.WPF.csproj
@@ -138,7 +138,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CSharpMath.Forms.Example\CSharpMath.Forms.Example\CSharpMath.Forms.Example.csproj">
+    <ProjectReference Include="..\CSharpMath.Forms.Example\CSharpMath.Forms.Example.csproj">
       <Project>{b3fa77b8-c6e9-4a78-8bd4-9a167da36637}</Project>
       <Name>CSharpMath.Forms.Example</Name>
     </ProjectReference>
diff --git a/CSharpMath.Forms.Example.WPF/MainWindow.xaml b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/MainWindow.xaml
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/MainWindow.xaml
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/MainWindow.xaml
diff --git a/CSharpMath.Forms.Example.WPF/MainWindow.xaml.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/MainWindow.xaml.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/MainWindow.xaml.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/MainWindow.xaml.cs
diff --git a/CSharpMath.Forms.Example.WPF/OpenTK.dll.config b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/OpenTK.dll.config
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/OpenTK.dll.config
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/OpenTK.dll.config
diff --git a/CSharpMath.Forms.Example.WPF/Properties/AssemblyInfo.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/AssemblyInfo.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/Properties/AssemblyInfo.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/AssemblyInfo.cs
diff --git a/CSharpMath.Forms.Example.WPF/Properties/Resources.Designer.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Resources.Designer.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/Properties/Resources.Designer.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Resources.Designer.cs
diff --git a/CSharpMath.Forms.Example.WPF/Properties/Resources.resx b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Resources.resx
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/Properties/Resources.resx
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Resources.resx
diff --git a/CSharpMath.Forms.Example.WPF/Properties/Settings.Designer.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Settings.Designer.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/Properties/Settings.Designer.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Settings.Designer.cs
diff --git a/CSharpMath.Forms.Example.WPF/Properties/Settings.settings b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Settings.settings
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/Properties/Settings.settings
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/Properties/Settings.settings
diff --git a/CSharpMath.Forms.Example.WPF/_TempRenderer.cs b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/_TempRenderer.cs
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/_TempRenderer.cs
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/_TempRenderer.cs
diff --git a/CSharpMath.Forms.Example.WPF/packages.config b/CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/packages.config
similarity index 100%
rename from CSharpMath.Forms.Example.WPF/packages.config
rename to CSharpMath.Forms.Example/CSharpMath.Forms.Example.WPF/packages.config
diff --git a/CSharpMath.sln b/CSharpMath.sln
index e00fada7..a331da3d 100644
--- a/CSharpMath.sln
+++ b/CSharpMath.sln
@@ -56,7 +56,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.TextBreak", "Typ
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Utils.UWPBuild", "CSharpMath.Utils.UWPBuild\CSharpMath.Utils.UWPBuild.csproj", "{3A17640B-83C6-459F-A046-F954DEA3FDE1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Forms.Example.WPF", "CSharpMath.Forms.Example.WPF\CSharpMath.Forms.Example.WPF.csproj", "{60549250-61D2-40E0-82C5-7B829193D694}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Forms.Example.WPF", "CSharpMath.Forms.Example\CSharpMath.Forms.Example.WPF\CSharpMath.Forms.Example.WPF.csproj", "{60549250-61D2-40E0-82C5-7B829193D694}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -249,6 +249,7 @@ Global
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Debug|x64.ActiveCfg = Debug|iPhone
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Debug|x86.ActiveCfg = Debug|iPhone
+		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Debug|x86.Build.0 = Debug|iPhone
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Release|Any CPU.ActiveCfg = Release|iPhone
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Release|Any CPU.Build.0 = Release|iPhone
 		{664EAD44-C19D-462B-9127-FD1106B4F3C6}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
@@ -625,6 +626,7 @@ Global
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Debug|x64.ActiveCfg = Debug|iPhone
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Debug|x86.ActiveCfg = Debug|iPhone
+		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Debug|x86.Build.0 = Debug|iPhone
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Release|Any CPU.ActiveCfg = Release|iPhone
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Release|ARM.ActiveCfg = Release|iPhone
 		{C5C93C69-E72E-4A87-89DA-1E4718C6306E}.Release|iPhone.ActiveCfg = Release|iPhone
diff --git a/CSharpMath/Atoms/Atom/Accent.cs b/CSharpMath/Atoms/Atom/Accent.cs
index 37bcd04e..09b150f7 100644
--- a/CSharpMath/Atoms/Atom/Accent.cs
+++ b/CSharpMath/Atoms/Atom/Accent.cs
@@ -15,8 +15,8 @@ public Accent(string value): base(MathAtomType.Accent, value) {
       .AppendInBraces(InnerList, NullHandling.LiteralNull)
       .ToString();
 
-    public override T Accept<T, THelper>(IMathAtomVisitor<T, THelper> visitor, THelper helper) {
-      return visitor.Visit(this, helper);
+    public override T Accept<T, THelper>(IMathAtomVisitor<T, THelper> visitor, THelper helper) {
+      return visitor.Visit(this, helper);
     }
 
     public Accent(Accent cloneMe, bool finalize): base(cloneMe, finalize) {