diff --git a/NatlinkSource/CMakeLists.txt b/NatlinkSource/CMakeLists.txt
index efe3f1de..584ae636 100644
--- a/NatlinkSource/CMakeLists.txt
+++ b/NatlinkSource/CMakeLists.txt
@@ -14,15 +14,15 @@ project(${PROJECT_NAME})
 
 # Source Files
 set(SRC_FILES
-        ./appsupp.cpp
-        ./dictobj.cpp
+        COM/appsupp.cpp
+        DictationObject.cpp
         ./DragCode.cpp
-        ./excepts.cpp
-        ./GramObj.cpp
+        Exceptions.cpp
+        GrammarObject.cpp
         ./natlink.cpp
         ./pythwrap.cpp
-        ./ResObj.cpp
-        ./SecdThrd.cpp
+        ResultObject.cpp
+        MessageWindow.cpp
         StdAfx.cpp
         natlink.rc
         )
@@ -30,17 +30,17 @@ source_group("Sources" FILES ${SRC_FILES})
 
 # Header Files
 set(HEADERS_FILES
-        appsupp.h
-        comsupp.h
-        dictobj.h
+        COM/appsupp.h
+        COM/comsupp.h
+        DictationObject.h
         DragCode.h
-        dspeech.h
-        excepts.h
-        GramObj.h
-        resobj.h
-        resource.h
-        SecdThrd.h
-        SPEECH.H
+        COM/dspeech.h
+        Exceptions.h
+        GrammarObject.h
+        ResultObject.h
+        Resource.h
+        MessageWindow.h
+        COM/SPEECH.H
         StdAfx.h
         )
 source_group("Headers" FILES ${HEADERS_FILES})
diff --git a/NatlinkSource/SPEECH.H b/NatlinkSource/COM/SPEECH.H
similarity index 100%
rename from NatlinkSource/SPEECH.H
rename to NatlinkSource/COM/SPEECH.H
diff --git a/NatlinkSource/appsupp.cpp b/NatlinkSource/COM/appsupp.cpp
similarity index 98%
rename from NatlinkSource/appsupp.cpp
rename to NatlinkSource/COM/appsupp.cpp
index bafcefd9..56a7949c 100644
--- a/NatlinkSource/appsupp.cpp
+++ b/NatlinkSource/COM/appsupp.cpp
@@ -10,9 +10,9 @@
 	decision simplifies the design somewhat.
 */
 
-#include "stdafx.h"
-#include "resource.h"
-#include "DragCode.h"
+#include "../StdAfx.h"
+#include "../Resource.h"
+#include "../DragCode.h"
 #include "appsupp.h"
 
 // from PythWrap.cpp
diff --git a/NatlinkSource/appsupp.h b/NatlinkSource/COM/appsupp.h
similarity index 100%
rename from NatlinkSource/appsupp.h
rename to NatlinkSource/COM/appsupp.h
diff --git a/NatlinkSource/comsupp.h b/NatlinkSource/COM/comsupp.h
similarity index 100%
rename from NatlinkSource/comsupp.h
rename to NatlinkSource/COM/comsupp.h
diff --git a/NatlinkSource/dspeech.h b/NatlinkSource/COM/dspeech.h
similarity index 100%
rename from NatlinkSource/dspeech.h
rename to NatlinkSource/COM/dspeech.h
diff --git a/NatlinkSource/dictobj.cpp b/NatlinkSource/DictationObject.cpp
similarity index 99%
rename from NatlinkSource/dictobj.cpp
rename to NatlinkSource/DictationObject.cpp
index d6329a65..879ef1d4 100644
--- a/NatlinkSource/dictobj.cpp
+++ b/NatlinkSource/DictationObject.cpp
@@ -10,9 +10,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "DictObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "DictationObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 
 // We use this macro to make sure the dictation object is usable
 #define MUSTBEUSABLE( func ) \
diff --git a/NatlinkSource/dictobj.h b/NatlinkSource/DictationObject.h
similarity index 100%
rename from NatlinkSource/dictobj.h
rename to NatlinkSource/DictationObject.h
diff --git a/NatlinkSource/DragCode.cpp b/NatlinkSource/DragCode.cpp
index a80a958d..c9fb1234 100644
--- a/NatlinkSource/DragCode.cpp
+++ b/NatlinkSource/DragCode.cpp
@@ -118,14 +118,14 @@
 
 
 #include "stdafx.h"
-#include "resource.h"
+#include "Resource.h"
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "dictobj.h"
-#include "appsupp.h"
-#include "SecdThrd.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "DictationObject.h"
+#include "COM/appsupp.h"
+#include "MessageWindow.h"
+#include "Exceptions.h"
 #include <cstring>
 
 // defined in PythWrap.cpp
diff --git a/NatlinkSource/excepts.cpp b/NatlinkSource/Exceptions.cpp
similarity index 99%
rename from NatlinkSource/excepts.cpp
rename to NatlinkSource/Exceptions.cpp
index d5c5edbf..1e7b61a6 100644
--- a/NatlinkSource/excepts.cpp
+++ b/NatlinkSource/Exceptions.cpp
@@ -10,9 +10,9 @@
 #include "stdafx.h"
 #include <stdarg.h>
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 
 // This is our set of error objects, one for each error listed in Excepts.h
 PyObject * ErrObjects[ ERROR_COUNT ];
diff --git a/NatlinkSource/excepts.h b/NatlinkSource/Exceptions.h
similarity index 100%
rename from NatlinkSource/excepts.h
rename to NatlinkSource/Exceptions.h
diff --git a/NatlinkSource/GramObj.cpp b/NatlinkSource/GrammarObject.cpp
similarity index 99%
rename from NatlinkSource/GramObj.cpp
rename to NatlinkSource/GrammarObject.cpp
index 74085cf9..6c65e95f 100644
--- a/NatlinkSource/GramObj.cpp
+++ b/NatlinkSource/GrammarObject.cpp
@@ -10,9 +10,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 #include <fstream>
 #include <vector>
 
diff --git a/NatlinkSource/GramObj.h b/NatlinkSource/GrammarObject.h
similarity index 100%
rename from NatlinkSource/GramObj.h
rename to NatlinkSource/GrammarObject.h
diff --git a/NatlinkSource/SecdThrd.cpp b/NatlinkSource/MessageWindow.cpp
similarity index 99%
rename from NatlinkSource/SecdThrd.cpp
rename to NatlinkSource/MessageWindow.cpp
index f6b10b7b..999f4da8 100644
--- a/NatlinkSource/SecdThrd.cpp
+++ b/NatlinkSource/MessageWindow.cpp
@@ -16,8 +16,8 @@
 */
 
 #include "stdafx.h"
-#include "resource.h"
-#include "SecdThrd.h"
+#include "Resource.h"
+#include "MessageWindow.h"
 #include <richedit.h>
 
 // This is the message we send to the other thread to add text to the output
diff --git a/NatlinkSource/SecdThrd.h b/NatlinkSource/MessageWindow.h
similarity index 100%
rename from NatlinkSource/SecdThrd.h
rename to NatlinkSource/MessageWindow.h
diff --git a/NatlinkSource/resource.h b/NatlinkSource/Resource.h
similarity index 100%
rename from NatlinkSource/resource.h
rename to NatlinkSource/Resource.h
diff --git a/NatlinkSource/ResObj.cpp b/NatlinkSource/ResultObject.cpp
similarity index 99%
rename from NatlinkSource/ResObj.cpp
rename to NatlinkSource/ResultObject.cpp
index 7fa169ae..0e3a89f1 100644
--- a/NatlinkSource/ResObj.cpp
+++ b/NatlinkSource/ResultObject.cpp
@@ -9,9 +9,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "ResObj.h"
-#include "Excepts.h"
-#include "GramObj.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
+#include "GrammarObject.h"
 
 // This macro is used at the top of functions which can not be called
 // when no grammar has been loaded
diff --git a/NatlinkSource/resobj.h b/NatlinkSource/ResultObject.h
similarity index 100%
rename from NatlinkSource/resobj.h
rename to NatlinkSource/ResultObject.h
diff --git a/NatlinkSource/StdAfx.h b/NatlinkSource/StdAfx.h
index b11bfe61..266ee9ca 100644
--- a/NatlinkSource/StdAfx.h
+++ b/NatlinkSource/StdAfx.h
@@ -45,9 +45,9 @@ extern CComModule _Module;
 #include <stdio.h>
 #include <assert.h>
 
-#include "speech.h"
-#include "dspeech.h"
-#include "comsupp.h"
+#include "COM/SPEECH.H"
+#include "COM/dspeech.h"
+#include "COM/comsupp.h"
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
diff --git a/NatlinkSource/idi_down.ico b/NatlinkSource/idi_down.ico
deleted file mode 100644
index 36e221ad..00000000
Binary files a/NatlinkSource/idi_down.ico and /dev/null differ
diff --git a/NatlinkSource/idi_down2.ico b/NatlinkSource/idi_down2.ico
deleted file mode 100644
index eaa99240..00000000
Binary files a/NatlinkSource/idi_down2.ico and /dev/null differ
diff --git a/NatlinkSource/idi_left.ico b/NatlinkSource/idi_left.ico
deleted file mode 100644
index 70a8e4d5..00000000
Binary files a/NatlinkSource/idi_left.ico and /dev/null differ
diff --git a/NatlinkSource/idi_left2.ico b/NatlinkSource/idi_left2.ico
deleted file mode 100644
index 319f8c9b..00000000
Binary files a/NatlinkSource/idi_left2.ico and /dev/null differ
diff --git a/NatlinkSource/idi_nodir.ico b/NatlinkSource/idi_nodir.ico
deleted file mode 100644
index 3c161d61..00000000
Binary files a/NatlinkSource/idi_nodir.ico and /dev/null differ
diff --git a/NatlinkSource/idi_right.ico b/NatlinkSource/idi_right.ico
deleted file mode 100644
index e63837f5..00000000
Binary files a/NatlinkSource/idi_right.ico and /dev/null differ
diff --git a/NatlinkSource/idi_right2.ico b/NatlinkSource/idi_right2.ico
deleted file mode 100644
index 5cc6e8d1..00000000
Binary files a/NatlinkSource/idi_right2.ico and /dev/null differ
diff --git a/NatlinkSource/idi_up.ico b/NatlinkSource/idi_up.ico
deleted file mode 100644
index cd2fab77..00000000
Binary files a/NatlinkSource/idi_up.ico and /dev/null differ
diff --git a/NatlinkSource/idi_up2.ico b/NatlinkSource/idi_up2.ico
deleted file mode 100644
index a757fb02..00000000
Binary files a/NatlinkSource/idi_up2.ico and /dev/null differ
diff --git a/NatlinkSource/natlink.aps b/NatlinkSource/natlink.aps
deleted file mode 100644
index dc4be5ee..00000000
Binary files a/NatlinkSource/natlink.aps and /dev/null differ
diff --git a/NatlinkSource/natlink.cpp b/NatlinkSource/natlink.cpp
index 521e2451..a309cbba 100644
--- a/NatlinkSource/natlink.cpp
+++ b/NatlinkSource/natlink.cpp
@@ -10,10 +10,10 @@
 */
 
 #include "stdafx.h"
-#include "resource.h"
+#include "Resource.h"
 #include "initguid.h"
 #include "DragCode.h"
-#include "appsupp.h"
+#include "COM/appsupp.h"
 
 CComModule _Module;
 
diff --git a/NatlinkSource/natlink.rc b/NatlinkSource/natlink.rc
index b059d5bd..73fdcb10 100644
--- a/NatlinkSource/natlink.rc
+++ b/NatlinkSource/natlink.rc
@@ -140,46 +140,7 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_RIGHT               ICON                    "idi_right.ico"
-IDI_RIGHT2              ICON                    "idi_right2.ico"
-IDI_DOWN                ICON                    "idi_down.ico"
-IDI_DOWN2               ICON                    "idi_down2.ico"
-IDI_LEFT                ICON                    "idi_left.ico"
-IDI_LEFT2               ICON                    "idi_left2.ico"
-IDI_UP                  ICON                    "idi_up.ico"
-IDI_UP2                 ICON                    "idi_up2.ico"
-IDI_NODIR               ICON                    "idi_nodir.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MENU MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Reload Everything",          IDD_RELOAD
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
 
-STRINGTABLE
-BEGIN
-    IDS_PROJNAME            "natlink"
-END
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
diff --git a/NatlinkSource/natlink.vcxproj b/NatlinkSource/natlink.vcxproj
deleted file mode 100644
index 25f037ff..00000000
--- a/NatlinkSource/natlink.vcxproj
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release 2.6 ANSI|Win32">
-      <Configuration>Release 2.6 ANSI</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release 2.6 UNICODE|Win32">
-      <Configuration>Release 2.6 UNICODE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release 2.7 ANSI|Win32">
-      <Configuration>Release 2.7 ANSI</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release 2.7 UNICODE|Win32">
-      <Configuration>Release 2.7 UNICODE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C6F7A937-B1E3-4864-AA67-5FA4D2803A7C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>natlink</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 UNICODE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 UNICODE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 ANSI|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 ANSI|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 UNICODE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 UNICODE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 ANSI|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 ANSI|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.pyd</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 UNICODE|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.pyd</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 UNICODE|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.pyd</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 ANSI|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.pyd</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 ANSI|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetExt>.pyd</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATLINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Python26\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python26\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>natlink.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 UNICODE|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATLINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Python26\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python26\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>natlink.def</ModuleDefinitionFile>
-      <OutputFile>$(OutDir)$(TargetName)_2.6_UNICODE$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 UNICODE|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATLINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Python27\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python27\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>natlink.def</ModuleDefinitionFile>
-      <OutputFile>C:\NatLink\NatLink\MacroSystem\core\natlink.pyd</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.6 ANSI|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATLINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Python26\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python26\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>natlink.def</ModuleDefinitionFile>
-      <OutputFile>$(OutDir)$(TargetName)_2.6_ANSI$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2.7 ANSI|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATLINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Python27\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\Python27\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>natlink.def</ModuleDefinitionFile>
-      <OutputFile>$(OutDir)$(TargetName)_2.7_ANSI$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="appsupp.cpp" />
-    <ClCompile Include="dictobj.cpp" />
-    <ClCompile Include="DragCode.cpp" />
-    <ClCompile Include="excepts.cpp" />
-    <ClCompile Include="GramObj.cpp" />
-    <ClCompile Include="natlink.cpp" />
-    <ClCompile Include="pythwrap.cpp" />
-    <ClCompile Include="ResObj.cpp" />
-    <ClCompile Include="SecdThrd.cpp" />
-    <ClCompile Include="StdAfx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="natlink.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appsupp.h" />
-    <ClInclude Include="comsupp.h" />
-    <ClInclude Include="dictobj.h" />
-    <ClInclude Include="DragCode.h" />
-    <ClInclude Include="dspeech.h" />
-    <ClInclude Include="excepts.h" />
-    <ClInclude Include="GramObj.h" />
-    <ClInclude Include="resobj.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="SecdThrd.h" />
-    <ClInclude Include="SPEECH.H" />
-    <ClInclude Include="StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="APPSUPP.REG" />
-    <None Include="idi_down.ico" />
-    <None Include="idi_down2.ico" />
-    <None Include="idi_left.ico" />
-    <None Include="idi_left2.ico" />
-    <None Include="idi_nodir.ico" />
-    <None Include="idi_right.ico" />
-    <None Include="idi_right2.ico" />
-    <None Include="idi_up.ico" />
-    <None Include="idi_up2.ico" />
-    <None Include="natlink.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/NatlinkSource/natlink.vcxproj.filters b/NatlinkSource/natlink.vcxproj.filters
deleted file mode 100644
index ac4f3c0d..00000000
--- a/NatlinkSource/natlink.vcxproj.filters
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="appsupp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dictobj.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DragCode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="excepts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GramObj.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="natlink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pythwrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ResObj.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SecdThrd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="natlink.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="appsupp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="comsupp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dictobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DragCode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dspeech.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="excepts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GramObj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SecdThrd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SPEECH.H">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="APPSUPP.REG" />
-    <None Include="idi_right.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_right2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_down.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_down2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_left.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_left2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_up.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_up2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="idi_nodir.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="natlink.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/NatlinkSource/natlink.vcxproj.user b/NatlinkSource/natlink.vcxproj.user
deleted file mode 100644
index ace9a86a..00000000
--- a/NatlinkSource/natlink.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/NatlinkSource/pythwrap.cpp b/NatlinkSource/pythwrap.cpp
index ab538401..d0aa2fff 100644
--- a/NatlinkSource/pythwrap.cpp
+++ b/NatlinkSource/pythwrap.cpp
@@ -20,10 +20,10 @@ PyMem_DEL.  Changing these calls to PyObject_Del below eliminated the crashes.
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "dictobj.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "DictationObject.h"
+#include "Exceptions.h"
 
 #ifdef INHOUSE
 #include "inhouse.h"