diff --git a/Parser/Parser-VS_2010.nproj b/Parser/Parser-VS_2010.nproj
deleted file mode 100644
index deed624..0000000
--- a/Parser/Parser-VS_2010.nproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
-    <Name>Parser</Name>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4e951655-3dff-4737-a348-0779570f48c0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Parser</RootNamespace>
-    <AssemblyName>Parser</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Parser.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="Nemerle.Peg, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
-      <Name>Nemerle.Peg</Name>
-      <AssemblyName>Nemerle.Peg.dll</AssemblyName>
-      <HintPath>$(Nemerle)\Nemerle.Peg.dll</HintPath>
-    </Reference>
-    <Reference Include="Nemerle.Peg.Macros, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
-      <Name>Nemerle.Peg.Macros</Name>
-      <AssemblyName>Nemerle.Peg.Macros.dll</AssemblyName>
-      <HintPath>$(Nemerle)\Nemerle.Peg.Macros.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="Nemerle">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(Nemerle)\Nemerle.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Ast.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Parser.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.n" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <MacroReference Include="Nemerle.Peg.Macros, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <Name>Nemerle.Peg.Macros</Name>
-      <AssemblyName>Nemerle.Peg.Macros.dll</AssemblyName>
-      <HintPath>$(Nemerle)\Nemerle.Peg.Macros.dll</HintPath>
-      <Private>False</Private>
-    </MacroReference>
-  </ItemGroup>
-  <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
-  <!--
-		To modify your build process, add your task inside one of the targets below and uncomment it. 
-		Other similar extension points exist, see Microsoft.Common.targets.
-
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-</Project>
\ No newline at end of file
diff --git a/Parser/Parser.nproj b/Parser/Parser.nproj
index 3c0146a..deed624 100644
--- a/Parser/Parser.nproj
+++ b/Parser/Parser.nproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle</Nemerle>
+    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
     <Name>Parser</Name>
   </PropertyGroup>
   <PropertyGroup>
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Parser</RootNamespace>
     <AssemblyName>Parser</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,11 +37,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="Nemerle.Peg, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="Nemerle.Peg, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
       <Name>Nemerle.Peg</Name>
       <AssemblyName>Nemerle.Peg.dll</AssemblyName>
       <HintPath>$(Nemerle)\Nemerle.Peg.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nemerle.Peg.Macros, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
+      <Name>Nemerle.Peg.Macros</Name>
+      <AssemblyName>Nemerle.Peg.Macros.dll</AssemblyName>
+      <HintPath>$(Nemerle)\Nemerle.Peg.Macros.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/TinyAcc.sln b/TinyAcc.sln
index d4d877e..39b05c1 100644
--- a/TinyAcc.sln
+++ b/TinyAcc.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "Parser-VS_2010", "Parser\Parser-VS_2010.nproj", "{4E951655-3DFF-4737-A348-0779570F48C0}"
+Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "Parser", "Parser\Parser.nproj", "{4E951655-3DFF-4737-A348-0779570F48C0}"
 EndProject
-Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "TinyAcc-VS_2010", "TinyAcc\TinyAcc-VS_2010.nproj", "{FBDDD4EE-0D10-4DD6-A8AF-213FAC1834EE}"
+Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "TinyAcc", "TinyAcc\TinyAcc.nproj", "{FBDDD4EE-0D10-4DD6-A8AF-213FAC1834EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/TinyAcc/TinyAcc-VS_2010.nproj b/TinyAcc/TinyAcc-VS_2010.nproj
deleted file mode 100644
index 4ac8a17..0000000
--- a/TinyAcc/TinyAcc-VS_2010.nproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
-    <Name>TinyAcc</Name>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{fbddd4ee-0d10-4dd6-a8af-213fac1834ee}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TinyAcc</RootNamespace>
-    <AssemblyName>TinyAcc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\TinyAcc</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <StartProgram>
-    </StartProgram>
-    <WorkingDirectory>C:\MyUsers\programs\manysrc\projects\GitHub\TinyAcc\TinyAcc\bin\Debug</WorkingDirectory>
-    <CmdArgs>
-    </CmdArgs>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Nemerle">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(Nemerle)\Nemerle.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Account.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CurrencyConverter.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LevelOneGrouping.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Main.n">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.n" />
-    <Compile Include="Utils.n">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Parser\Parser-VS_2010.nproj">
-      <Name>Parser-VS_2010</Name>
-      <Project>{4e951655-3dff-4737-a348-0779570f48c0}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
-  <!--
-		To modify your build process, add your task inside one of the targets below and uncomment it. 
-		Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-</Project>
\ No newline at end of file
diff --git a/TinyAcc/TinyAcc.nproj b/TinyAcc/TinyAcc.nproj
index 18f666b..de6855a 100644
--- a/TinyAcc/TinyAcc.nproj
+++ b/TinyAcc/TinyAcc.nproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle</Nemerle>
+    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
     <Name>TinyAcc</Name>
   </PropertyGroup>
   <PropertyGroup>
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TinyAcc</RootNamespace>
     <AssemblyName>TinyAcc</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">