diff --git a/samples/README.txt b/samples/README.txt
deleted file mode 100644
index e546231..0000000
--- a/samples/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-The ADO sample is a wrapper for the ADO classes. This demonstrates how
-to write JACOB wrappers.
-
-The applet sample shows how to use JACOB in an applet. The trick is to
-initialize and use the COM object in the same thread.
-
-The test directory has numerous tests that test various features
-of the JACOB functionality.
diff --git a/samples/com/jacob/samples/JavaWebStart/DLLFromJARClassLoader.java b/samples/com/jacob/samples/JavaWebStart/DLLFromJARClassLoader.java
deleted file mode 100644
index f888dc7..0000000
--- a/samples/com/jacob/samples/JavaWebStart/DLLFromJARClassLoader.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.jacob.samples.JavaWebStart;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import com.jacob.com.LibraryLoader;
-
-/**
- * It is sometimes necessary to run Jacob without being able to install the dll
- * on the client machine. This is true in JavaWebStart (JWS) and possibly Applet
- * (assuming security allows access to the file system). The obvious thing to do
- * here is to jar up the Jacob.dll so that it can be downloaded the client along
- * with the rest of the resources. This is simple except that the System.Load()
- * function does not search jar files for DLLs. It searches the classpath. The
- * work around to this problem is to write the DLL to a temporary file and then
- * explicitly load the DLL calling passing the full path to the temporary file.
- * 
- * The following code demonstrates this idea.
- * 
- * @author joe
- * 
- */
-public class DLLFromJARClassLoader {
-
-	/**
-	 * Load the DLL from the classpath rather than from the java path. This code
-	 * uses this class's class loader to find the dell in one of the jar files
-	 * in this class's class path. It then writes the file as a temp file and
-	 * calls Load() on the temp file. The temporary file is marked to be deleted
-	 * on exit so the dll is deleted from the system when the application exits.
-	 * <p>
-	 * Derived from ample code found in Sun's java forums <p.
-	 * 
-	 * @return true if the native library has loaded, false if there was a
-	 *         problem.
-	 */
-	public boolean loadLibrary() {
-		try {
-			// this assumes that the dll is in the root dir of the signed
-			// jws jar file for this application.
-			//
-			// Starting in 1.14M6, the dll is named by platform and architecture
-			// so the best thing to do is to ask the LibraryLoader what name we
-			// expect.
-			// this code might be different if you customize the name of
-			// the jacob dll to match some custom naming convention
-			InputStream inputStream = getClass().getResource(
-					"/" + LibraryLoader.getPreferredDLLName() + ".dll")
-					.openStream();
-			// Put the DLL somewhere we can find it with a name Jacob expects
-			File temporaryDll = File.createTempFile(LibraryLoader
-					.getPreferredDLLName(), ".dll");
-			FileOutputStream outputStream = new FileOutputStream(temporaryDll);
-			byte[] array = new byte[8192];
-			for (int i = inputStream.read(array); i != -1; i = inputStream
-					.read(array)) {
-				outputStream.write(array, 0, i);
-			}
-			outputStream.close();
-			temporaryDll.deleteOnExit();
-			// Ask LibraryLoader to load the dll for us based on the path we
-			// set
-			System.setProperty(LibraryLoader.JACOB_DLL_PATH, temporaryDll
-					.getPath());
-			LibraryLoader.loadJacobLibrary();
-			return true;
-		} catch (Throwable e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-}
diff --git a/samples/com/jacob/samples/office/~$stDocument.doc b/samples/com/jacob/samples/office/~$stDocument.doc
deleted file mode 100644
index 56c1004..0000000
Binary files a/samples/com/jacob/samples/office/~$stDocument.doc and /dev/null differ
diff --git a/samples/com/jacob/samples/servlet/JacobScript.java_nocompile b/samples/com/jacob/samples/servlet/JacobScript.java_nocompile
deleted file mode 100644
index fb09a34..0000000
--- a/samples/com/jacob/samples/servlet/JacobScript.java_nocompile
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.jacob.samples.servlet;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-
-import com.jacob.com.*;
-import com.jacob.activeX.*;
-
-public class JacobScript extends javax.servlet.http.HttpServlet 
-{
-  public void doGet(HttpServletRequest req, 
-                    HttpServletResponse res) 
-      throws ServletException
-  {
-    PrintWriter out = null;
-    try
-    {
-      res.setContentType("text/html");
-      out = res.getWriter();
-      // display a form
-      out.println("<h1>Enter a VBScript Expression</h1>");
-      out.println("<form method=\"POST\" action=\"/JacobScript\">");
-      out.println("<input name=\"expr\" type=\"text\" width=64>");
-      out.println("<input type=\"submit\">");
-      out.println("</form>");
-    } catch (Exception e) {
-      e.printStackTrace();
-      out.println("<H2>Error:"+e+"</H2>");
-    }
-  }
-
-  public void doPost(HttpServletRequest req, 
-                    HttpServletResponse res) 
-      throws ServletException
-  {
-    PrintWriter out = null;
-
-    try 
-    {
-      res.setContentType("text/html");
-      out = res.getWriter();
-      // get what they typed in
-      String expr = (String)req.getParameter("expr");
-      // make sure we have a session
-      HttpSession session = req.getSession(true);
-      Dispatch sControl = null;
-      if (session.isNew()) 
-      {
-        // initialize the control and store it on the session
-        String lang = "VBScript";
-        ActiveXComponent sC = new ActiveXComponent("ScriptControl");
-        sControl = sC.getObject();
-        Dispatch.put(sControl, "Language", lang);
-        session.putValue("control", sControl);
-      }
-      else
-      {
-        sControl = (Dispatch)session.getValue("control");
-      }
-      Variant result = Dispatch.call(sControl, "Eval", expr);
-      // display a form
-      out.println("<h1>Enter a VBScript Expression</h1>");
-      out.println("<form method=\"POST\" action=\"/JacobScript\">");
-      out.println("<input name=\"expr\" type=\"text\" value=\""+expr+"\" width=64>");
-      out.println("<input type=\"submit\">");
-      out.println("</form>");
-      out.println("<H1>Jacob Response:</H1>");
-      out.println("<H2>"+result+"</H2>");
-    } catch (Exception e) {
-      e.printStackTrace();
-      out.println("<H2>Error:"+e+"</H2>");
-    }
-  }
-}
diff --git a/samples/com/jacob/samples/servlet/readme.txt b/samples/com/jacob/samples/servlet/readme.txt
deleted file mode 100644
index 145223d..0000000
--- a/samples/com/jacob/samples/servlet/readme.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-This sample runs in Weblogic 5.1 as a servlet.
-
-0. Rename JacobScript.java_nocompile to JacobScript.java
-1. Compile this file (make sure you have jdk1.2 installed or the
-   javax.servlet.* classes in your classpath).
-2. Make sure the weblogic policy file allows native access. The easiest
-   way is to replace the contents with this:
-
-grant codeBase "file:d:/weblogic/-" {
-  permission java.security.AllPermission;
-};
-
-grant codeBase "file:/c:/classes/-" {
-  permission java.security.AllPermission;
-};
-
-
-grant codeBase "file:${java.home}/lib/ext/-" {
-  permission java.security.AllPermission;
-};
-
-grant { 
-  permission java.security.AllPermission;
-};
-
-3. Add the servlet to the weblogic.properties file:
-
-weblogic.httpd.register.JacobScript=JacobScript
-
-4. Either add your CLASSPATH to weblogic.classpath in startWebLogic.cmd
-   or copy the com directory into weblogic/myserver/servletclasses
-
-5. Copy the jacob/samples/servlet/* into weblogic/myserver/servletclasses
-6. Start weblogic
-
-7. Type the url: http://localhost:7001/JacobScript into the browser
-   (If you run on port 7001)
-
-8. Enter a VBScript expression like:
-   1+2
-   Now
-   "hello" & " world"
-   etc.
-   and watch the MS Script control (which you must have installed)
-   evaluate and return the result.
diff --git a/samples/com/jacob/samples/MathProj/Math.cls b/src/sample/com/jacob/samples/MathProj/Math.cls
similarity index 96%
rename from samples/com/jacob/samples/MathProj/Math.cls
rename to src/sample/com/jacob/samples/MathProj/Math.cls
index bcabdfa..b5d1d04 100644
--- a/samples/com/jacob/samples/MathProj/Math.cls
+++ b/src/sample/com/jacob/samples/MathProj/Math.cls
@@ -1,37 +1,37 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-  Persistable = 0  'NotPersistable
-  DataBindingBehavior = 0  'vbNone
-  DataSourceBehavior  = 0  'vbNone
-  MTSTransactionMode  = 0  'NotAnMTSObject
-END
-Attribute VB_Name = "Math"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = False
-Attribute VB_Exposed = True
-Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
-Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
-'To fire this event, use RaiseEvent with the following syntax:
-'RaiseEvent DoneAdd[(arg1, arg2, ... , argn)]
-Public Event DoneAdd(result As Variant)
-'To fire this event, use RaiseEvent with the following syntax:
-'RaiseEvent DoneMult[(arg1, arg2, ... , argn)]
-Public Event DoneMult(result As Variant)
-
-
-Public Function Mult(in1 As Variant, in2 As Variant) As Variant
-  Mult = in1 * in2
-  RaiseEvent DoneMult(in1 * in2)
-End Function
-
-Public Function Add(in1 As Variant, in2 As Variant) As Variant
-  Add = in1 + in2
-  RaiseEvent DoneAdd(in1 + in2)
-End Function
-
-Public Function getNothing() As Variant
-  Set getNothing = Nothing
-End Function
-
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+  Persistable = 0  'NotPersistable
+  DataBindingBehavior = 0  'vbNone
+  DataSourceBehavior  = 0  'vbNone
+  MTSTransactionMode  = 0  'NotAnMTSObject
+END
+Attribute VB_Name = "Math"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = False
+Attribute VB_Exposed = True
+Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
+Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
+'To fire this event, use RaiseEvent with the following syntax:
+'RaiseEvent DoneAdd[(arg1, arg2, ... , argn)]
+Public Event DoneAdd(result As Variant)
+'To fire this event, use RaiseEvent with the following syntax:
+'RaiseEvent DoneMult[(arg1, arg2, ... , argn)]
+Public Event DoneMult(result As Variant)
+
+
+Public Function Mult(in1 As Variant, in2 As Variant) As Variant
+  Mult = in1 * in2
+  RaiseEvent DoneMult(in1 * in2)
+End Function
+
+Public Function Add(in1 As Variant, in2 As Variant) As Variant
+  Add = in1 + in2
+  RaiseEvent DoneAdd(in1 + in2)
+End Function
+
+Public Function getNothing() As Variant
+  Set getNothing = Nothing
+End Function
+
diff --git a/samples/com/jacob/samples/MathProj/MathTest.dll b/src/sample/com/jacob/samples/MathProj/MathTest.dll
similarity index 100%
rename from samples/com/jacob/samples/MathProj/MathTest.dll
rename to src/sample/com/jacob/samples/MathProj/MathTest.dll
diff --git a/samples/com/jacob/samples/MathProj/MathTest.exp b/src/sample/com/jacob/samples/MathProj/MathTest.exp
similarity index 100%
rename from samples/com/jacob/samples/MathProj/MathTest.exp
rename to src/sample/com/jacob/samples/MathProj/MathTest.exp
diff --git a/samples/com/jacob/samples/MathProj/MathTest.java b/src/sample/com/jacob/samples/MathProj/MathTest.java
similarity index 100%
rename from samples/com/jacob/samples/MathProj/MathTest.java
rename to src/sample/com/jacob/samples/MathProj/MathTest.java
diff --git a/samples/com/jacob/samples/MathProj/MathTest.lib b/src/sample/com/jacob/samples/MathProj/MathTest.lib
similarity index 100%
rename from samples/com/jacob/samples/MathProj/MathTest.lib
rename to src/sample/com/jacob/samples/MathProj/MathTest.lib
diff --git a/samples/com/jacob/samples/MathProj/MathTest.vbp b/src/sample/com/jacob/samples/MathProj/MathTest.vbp
similarity index 95%
rename from samples/com/jacob/samples/MathProj/MathTest.vbp
rename to src/sample/com/jacob/samples/MathProj/MathTest.vbp
index f845ba3..22d0a71 100644
--- a/samples/com/jacob/samples/MathProj/MathTest.vbp
+++ b/src/sample/com/jacob/samples/MathProj/MathTest.vbp
@@ -1,35 +1,35 @@
-Type=OleDll
-Class=Math; Math.cls
-Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\System32\StdOle2.Tlb#OLE Automation
-Startup="(None)"
-HelpFile=""
-Title="MathTest"
-ExeName32="MathTest.dll"
-Command32=""
-Name="MathTest"
-HelpContextID="0"
-CompatibleMode="1"
-CompatibleEXE32="MathTest.dll"
-MajorVer=1
-MinorVer=0
-RevisionVer=0
-AutoIncrementVer=0
-ServerSupportFiles=0
-VersionCompanyName="Inventure America, Inc."
-CompilationType=0
-OptimizationType=0
-FavorPentiumPro(tm)=0
-CodeViewDebugInfo=0
-NoAliasing=0
-BoundsCheck=0
-OverflowCheck=0
-FlPointCheck=0
-FDIVCheck=0
-UnroundedFP=0
-StartMode=1
-Unattended=0
-Retained=0
-ThreadPerObject=0
-MaxNumberOfThreads=1
-ThreadingModel=1
-DebugStartupOption=0
+Type=OleDll
+Class=Math; Math.cls
+Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\System32\StdOle2.Tlb#OLE Automation
+Startup="(None)"
+HelpFile=""
+Title="MathTest"
+ExeName32="MathTest.dll"
+Command32=""
+Name="MathTest"
+HelpContextID="0"
+CompatibleMode="1"
+CompatibleEXE32="MathTest.dll"
+MajorVer=1
+MinorVer=0
+RevisionVer=0
+AutoIncrementVer=0
+ServerSupportFiles=0
+VersionCompanyName="Inventure America, Inc."
+CompilationType=0
+OptimizationType=0
+FavorPentiumPro(tm)=0
+CodeViewDebugInfo=0
+NoAliasing=0
+BoundsCheck=0
+OverflowCheck=0
+FlPointCheck=0
+FDIVCheck=0
+UnroundedFP=0
+StartMode=1
+Unattended=0
+Retained=0
+ThreadPerObject=0
+MaxNumberOfThreads=1
+ThreadingModel=1
+DebugStartupOption=0
diff --git a/samples/com/jacob/samples/MathProj/MathTest.vbw b/src/sample/com/jacob/samples/MathProj/MathTest.vbw
similarity index 96%
rename from samples/com/jacob/samples/MathProj/MathTest.vbw
rename to src/sample/com/jacob/samples/MathProj/MathTest.vbw
index 31e7a59..5eac0c8 100644
--- a/samples/com/jacob/samples/MathProj/MathTest.vbw
+++ b/src/sample/com/jacob/samples/MathProj/MathTest.vbw
@@ -1 +1 @@
-Math = 75, 13, 656, 554, 
+Math = 75, 13, 656, 554, 
diff --git a/samples/com/jacob/samples/MathProj/README.txt b/src/sample/com/jacob/samples/MathProj/README.txt
similarity index 100%
rename from samples/com/jacob/samples/MathProj/README.txt
rename to src/sample/com/jacob/samples/MathProj/README.txt
diff --git a/samples/com/jacob/samples/access/Access.java b/src/sample/com/jacob/samples/access/Access.java
similarity index 100%
rename from samples/com/jacob/samples/access/Access.java
rename to src/sample/com/jacob/samples/access/Access.java
diff --git a/samples/com/jacob/samples/access/sample2.mdb b/src/sample/com/jacob/samples/access/sample2.mdb
similarity index 100%
rename from samples/com/jacob/samples/access/sample2.mdb
rename to src/sample/com/jacob/samples/access/sample2.mdb
diff --git a/samples/com/jacob/samples/ado/ADO_README.txt b/src/sample/com/jacob/samples/ado/ADO_README.txt
similarity index 100%
rename from samples/com/jacob/samples/ado/ADO_README.txt
rename to src/sample/com/jacob/samples/ado/ADO_README.txt
diff --git a/samples/com/jacob/samples/ado/Command.java b/src/sample/com/jacob/samples/ado/Command.java
similarity index 100%
rename from samples/com/jacob/samples/ado/Command.java
rename to src/sample/com/jacob/samples/ado/Command.java
diff --git a/samples/com/jacob/samples/ado/CommandTypeEnum.java b/src/sample/com/jacob/samples/ado/CommandTypeEnum.java
similarity index 100%
rename from samples/com/jacob/samples/ado/CommandTypeEnum.java
rename to src/sample/com/jacob/samples/ado/CommandTypeEnum.java
diff --git a/samples/com/jacob/samples/ado/Connection.java b/src/sample/com/jacob/samples/ado/Connection.java
similarity index 100%
rename from samples/com/jacob/samples/ado/Connection.java
rename to src/sample/com/jacob/samples/ado/Connection.java
diff --git a/samples/com/jacob/samples/ado/Field.java b/src/sample/com/jacob/samples/ado/Field.java
similarity index 100%
rename from samples/com/jacob/samples/ado/Field.java
rename to src/sample/com/jacob/samples/ado/Field.java
diff --git a/samples/com/jacob/samples/ado/Fields.java b/src/sample/com/jacob/samples/ado/Fields.java
similarity index 100%
rename from samples/com/jacob/samples/ado/Fields.java
rename to src/sample/com/jacob/samples/ado/Fields.java
diff --git a/samples/com/jacob/samples/ado/Recordset.java b/src/sample/com/jacob/samples/ado/Recordset.java
similarity index 100%
rename from samples/com/jacob/samples/ado/Recordset.java
rename to src/sample/com/jacob/samples/ado/Recordset.java
diff --git a/samples/com/jacob/samples/ado/ms/README.txt b/src/sample/com/jacob/samples/ado/ms/README.txt
similarity index 100%
rename from samples/com/jacob/samples/ado/ms/README.txt
rename to src/sample/com/jacob/samples/ado/ms/README.txt
diff --git a/samples/com/jacob/samples/ado/ms/testms.java.txt b/src/sample/com/jacob/samples/ado/ms/testms.java.txt
similarity index 100%
rename from samples/com/jacob/samples/ado/ms/testms.java.txt
rename to src/sample/com/jacob/samples/ado/ms/testms.java.txt
diff --git a/samples/com/jacob/samples/ado/test.java b/src/sample/com/jacob/samples/ado/test.java
similarity index 100%
rename from samples/com/jacob/samples/ado/test.java
rename to src/sample/com/jacob/samples/ado/test.java
diff --git a/samples/com/jacob/samples/applet/AppTest.html b/src/sample/com/jacob/samples/applet/AppTest.html
similarity index 100%
rename from samples/com/jacob/samples/applet/AppTest.html
rename to src/sample/com/jacob/samples/applet/AppTest.html
diff --git a/samples/com/jacob/samples/applet/Applet.html b/src/sample/com/jacob/samples/applet/Applet.html
similarity index 100%
rename from samples/com/jacob/samples/applet/Applet.html
rename to src/sample/com/jacob/samples/applet/Applet.html
diff --git a/samples/com/jacob/samples/applet/Applet.jnlp b/src/sample/com/jacob/samples/applet/Applet.jnlp
similarity index 100%
rename from samples/com/jacob/samples/applet/Applet.jnlp
rename to src/sample/com/jacob/samples/applet/Applet.jnlp
diff --git a/samples/com/jacob/samples/applet/JacobTestApplet.java b/src/sample/com/jacob/samples/applet/JacobTestApplet.java
similarity index 100%
rename from samples/com/jacob/samples/applet/JacobTestApplet.java
rename to src/sample/com/jacob/samples/applet/JacobTestApplet.java
diff --git a/samples/com/jacob/samples/applet/Readme.txt b/src/sample/com/jacob/samples/applet/Readme.txt
similarity index 100%
rename from samples/com/jacob/samples/applet/Readme.txt
rename to src/sample/com/jacob/samples/applet/Readme.txt
diff --git a/samples/com/jacob/samples/atl/MultiFace/Face.cpp b/src/sample/com/jacob/samples/atl/MultiFace/Face.cpp
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/Face.cpp
rename to src/sample/com/jacob/samples/atl/MultiFace/Face.cpp
diff --git a/samples/com/jacob/samples/atl/MultiFace/Face.h b/src/sample/com/jacob/samples/atl/MultiFace/Face.h
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/Face.h
rename to src/sample/com/jacob/samples/atl/MultiFace/Face.h
diff --git a/samples/com/jacob/samples/atl/MultiFace/Face.rgs b/src/sample/com/jacob/samples/atl/MultiFace/Face.rgs
similarity index 95%
rename from samples/com/jacob/samples/atl/MultiFace/Face.rgs
rename to src/sample/com/jacob/samples/atl/MultiFace/Face.rgs
index 70682d3..9d442a9 100644
--- a/samples/com/jacob/samples/atl/MultiFace/Face.rgs
+++ b/src/sample/com/jacob/samples/atl/MultiFace/Face.rgs
@@ -1,23 +1,23 @@
-HKCR
-{
-	MultiFace.Face.1 = s 'Face Class'
-	{
-		CLSID = s '{9BF24412-B2E0-11D4-A695-00104BFF3241}'
-	}
-	MultiFace.Face = s 'Face Class'
-	{
-		CLSID = s '{9BF24412-B2E0-11D4-A695-00104BFF3241}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {9BF24412-B2E0-11D4-A695-00104BFF3241} = s 'Face Class'
-		{
-			ProgID = s 'MultiFace.Face.1'
-			VersionIndependentProgID = s 'MultiFace.Face'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
+HKCR
+{
+	MultiFace.Face.1 = s 'Face Class'
+	{
+		CLSID = s '{9BF24412-B2E0-11D4-A695-00104BFF3241}'
+	}
+	MultiFace.Face = s 'Face Class'
+	{
+		CLSID = s '{9BF24412-B2E0-11D4-A695-00104BFF3241}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {9BF24412-B2E0-11D4-A695-00104BFF3241} = s 'Face Class'
+		{
+			ProgID = s 'MultiFace.Face.1'
+			VersionIndependentProgID = s 'MultiFace.Face'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.aps b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.aps
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.aps
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.aps
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.cpp b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.cpp
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.cpp
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.cpp
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.def b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.def
similarity index 96%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.def
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.def
index 3a720ec..089f6b5 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.def
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.def
@@ -1,9 +1,9 @@
-; MultiFace.def : Declares the module parameters.
-
-LIBRARY      "MultiFace.DLL"
-
-EXPORTS
-	DllCanUnloadNow     @1 PRIVATE
-	DllGetClassObject   @2 PRIVATE
-	DllRegisterServer   @3 PRIVATE
-	DllUnregisterServer	@4 PRIVATE
+; MultiFace.def : Declares the module parameters.
+
+LIBRARY      "MultiFace.DLL"
+
+EXPORTS
+	DllCanUnloadNow     @1 PRIVATE
+	DllGetClassObject   @2 PRIVATE
+	DllRegisterServer   @3 PRIVATE
+	DllUnregisterServer	@4 PRIVATE
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsp b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsp
similarity index 97%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.dsp
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsp
index 8bf5a50..a6231e4 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsp
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsp
@@ -1,323 +1,323 @@
-# Microsoft Developer Studio Project File - Name="MultiFace" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=MultiFace - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "MultiFace.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "MultiFace.mak" CFG="MultiFace - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MultiFace - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "MultiFace - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "MultiFace - Win32 Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "MultiFace - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "MultiFace - Win32 Unicode Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "MultiFace - Win32 Unicode Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "MultiFace - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ     /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ     /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# Begin Custom Build - Performing registration
-OutDir=.\Debug
-TargetPath=.\Debug\MultiFace.dll
-InputPath=.\Debug\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugU"
-# PROP BASE Intermediate_Dir "DebugU"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugU"
-# PROP Intermediate_Dir "DebugU"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ   /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ   /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# Begin Custom Build - Performing registration
-OutDir=.\DebugU
-TargetPath=.\DebugU\MultiFace.dll
-InputPath=.\DebugU\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "MultiFace - Win32 Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseMinSize"
-# PROP BASE Intermediate_Dir "ReleaseMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinSize"
-# PROP Intermediate_Dir "ReleaseMinSize"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\ReleaseMinSize
-TargetPath=.\ReleaseMinSize\MultiFace.dll
-InputPath=.\ReleaseMinSize\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "MultiFace - Win32 Release MinDependency"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseMinDependency"
-# PROP BASE Intermediate_Dir "ReleaseMinDependency"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinDependency"
-# PROP Intermediate_Dir "ReleaseMinDependency"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\ReleaseMinDependency
-TargetPath=.\ReleaseMinDependency\MultiFace.dll
-InputPath=.\ReleaseMinDependency\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUMinSize"
-# PROP BASE Intermediate_Dir "ReleaseUMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinSize"
-# PROP Intermediate_Dir "ReleaseUMinSize"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\ReleaseUMinSize
-TargetPath=.\ReleaseUMinSize\MultiFace.dll
-InputPath=.\ReleaseUMinSize\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Release MinDependency"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUMinDependency"
-# PROP BASE Intermediate_Dir "ReleaseUMinDependency"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinDependency"
-# PROP Intermediate_Dir "ReleaseUMinDependency"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\ReleaseUMinDependency
-TargetPath=.\ReleaseUMinDependency\MultiFace.dll
-InputPath=.\ReleaseUMinDependency\MultiFace.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ENDIF 
-
-# Begin Target
-
-# Name "MultiFace - Win32 Debug"
-# Name "MultiFace - Win32 Unicode Debug"
-# Name "MultiFace - Win32 Release MinSize"
-# Name "MultiFace - Win32 Release MinDependency"
-# Name "MultiFace - Win32 Unicode Release MinSize"
-# Name "MultiFace - Win32 Unicode Release MinDependency"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\Face.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MultiFace.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MultiFace.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\MultiFace.idl
-# ADD MTL /tlb ".\MultiFace.tlb" /h "MultiFace.h" /iid "MultiFace_i.c" /Oicf
-# End Source File
-# Begin Source File
-
-SOURCE=.\MultiFace.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\Face.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\Face.rgs
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="MultiFace" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=MultiFace - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "MultiFace.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "MultiFace.mak" CFG="MultiFace - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "MultiFace - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "MultiFace - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "MultiFace - Win32 Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "MultiFace - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "MultiFace - Win32 Unicode Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "MultiFace - Win32 Unicode Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "MultiFace - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ     /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ     /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# Begin Custom Build - Performing registration
+OutDir=.\Debug
+TargetPath=.\Debug\MultiFace.dll
+InputPath=.\Debug\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugU"
+# PROP BASE Intermediate_Dir "DebugU"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugU"
+# PROP Intermediate_Dir "DebugU"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ   /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ   /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# Begin Custom Build - Performing registration
+OutDir=.\DebugU
+TargetPath=.\DebugU\MultiFace.dll
+InputPath=.\DebugU\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	if "%OS%"=="" goto NOTNT 
+	if not "%OS%"=="Windows_NT" goto NOTNT 
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	goto end 
+	:NOTNT 
+	echo Warning : Cannot register Unicode DLL on Windows 95 
+	:end 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "MultiFace - Win32 Release MinSize"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseMinSize"
+# PROP BASE Intermediate_Dir "ReleaseMinSize"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseMinSize"
+# PROP Intermediate_Dir "ReleaseMinSize"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# Begin Custom Build - Performing registration
+OutDir=.\ReleaseMinSize
+TargetPath=.\ReleaseMinSize\MultiFace.dll
+InputPath=.\ReleaseMinSize\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "MultiFace - Win32 Release MinDependency"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseMinDependency"
+# PROP BASE Intermediate_Dir "ReleaseMinDependency"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseMinDependency"
+# PROP Intermediate_Dir "ReleaseMinDependency"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# Begin Custom Build - Performing registration
+OutDir=.\ReleaseMinDependency
+TargetPath=.\ReleaseMinDependency\MultiFace.dll
+InputPath=.\ReleaseMinDependency\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Release MinSize"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseUMinSize"
+# PROP BASE Intermediate_Dir "ReleaseUMinSize"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseUMinSize"
+# PROP Intermediate_Dir "ReleaseUMinSize"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# Begin Custom Build - Performing registration
+OutDir=.\ReleaseUMinSize
+TargetPath=.\ReleaseUMinSize\MultiFace.dll
+InputPath=.\ReleaseUMinSize\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	if "%OS%"=="" goto NOTNT 
+	if not "%OS%"=="Windows_NT" goto NOTNT 
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	goto end 
+	:NOTNT 
+	echo Warning : Cannot register Unicode DLL on Windows 95 
+	:end 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "MultiFace - Win32 Unicode Release MinDependency"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseUMinDependency"
+# PROP BASE Intermediate_Dir "ReleaseUMinDependency"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseUMinDependency"
+# PROP Intermediate_Dir "ReleaseUMinDependency"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# Begin Custom Build - Performing registration
+OutDir=.\ReleaseUMinDependency
+TargetPath=.\ReleaseUMinDependency\MultiFace.dll
+InputPath=.\ReleaseUMinDependency\MultiFace.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	if "%OS%"=="" goto NOTNT 
+	if not "%OS%"=="Windows_NT" goto NOTNT 
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	goto end 
+	:NOTNT 
+	echo Warning : Cannot register Unicode DLL on Windows 95 
+	:end 
+	
+# End Custom Build
+
+!ENDIF 
+
+# Begin Target
+
+# Name "MultiFace - Win32 Debug"
+# Name "MultiFace - Win32 Unicode Debug"
+# Name "MultiFace - Win32 Release MinSize"
+# Name "MultiFace - Win32 Release MinDependency"
+# Name "MultiFace - Win32 Unicode Release MinSize"
+# Name "MultiFace - Win32 Unicode Release MinDependency"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Face.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MultiFace.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MultiFace.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\MultiFace.idl
+# ADD MTL /tlb ".\MultiFace.tlb" /h "MultiFace.h" /iid "MultiFace_i.c" /Oicf
+# End Source File
+# Begin Source File
+
+SOURCE=.\MultiFace.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Face.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\Face.rgs
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsw b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsw
similarity index 94%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.dsw
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsw
index 4d6beb1..e6b7f0d 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.dsw
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MultiFace"=.\MultiFace.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "MultiFace"=.\MultiFace.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.h b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.h
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.h
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.h
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.idl b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.idl
similarity index 95%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.idl
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.idl
index 37b07aa..0ad36a9 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.idl
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.idl
@@ -1,70 +1,70 @@
-// MultiFace.idl : IDL source for MultiFace.dll
-//
-
-// This file will be processed by the MIDL tool to
-// produce the type library (MultiFace.tlb) and marshalling code.
-
-import "oaidl.idl";
-import "ocidl.idl";
-	
-	[
-		object,
-		uuid(9BF2440F-B2E0-11D4-A695-00104BFF3241),
-		dual,
-		helpstring("IFace1 Interface"),
-		pointer_default(unique)
-	]
-	interface IFace1 : IDispatch
-	{
-		[propget, id(1), helpstring("property Face1Name")] HRESULT Face1Name([out, retval] BSTR *pVal);
-		[propput, id(1), helpstring("property Face1Name")] HRESULT Face1Name([in] BSTR newVal);
-	};
-
-	[
-		object,
-		uuid(9BF24410-B2E0-11D4-A695-00104BFF3241),
-		dual,
-		helpstring("IFace2 Interface"),
-		pointer_default(unique)
-	]
-	interface IFace2 : IDispatch
-	{
-		[propget, id(1), helpstring("property Face2Nam")] HRESULT Face2Nam([out, retval] BSTR *pVal);
-		[propput, id(1), helpstring("property Face2Nam")] HRESULT Face2Nam([in] BSTR newVal);
-	};
-
-	[
-		object,
-		uuid(9BF24411-B2E0-11D4-A695-00104BFF3241),
-		dual,
-		helpstring("IFace3 Interface"),
-		pointer_default(unique)
-	]
-	interface IFace3 : IDispatch
-	{
-		[propget, id(1), helpstring("property Face3Name")] HRESULT Face3Name([out, retval] BSTR *pVal);
-		[propput, id(1), helpstring("property Face3Name")] HRESULT Face3Name([in] BSTR newVal);
-	};
-
-[
-	uuid(9BF24403-B2E0-11D4-A695-00104BFF3241),
-	version(1.0),
-	helpstring("MultiFace 1.0 Type Library")
-]
-library MULTIFACELib
-{
-	importlib("stdole32.tlb");
-	importlib("stdole2.tlb");
-
-	
-	[
-		uuid(9BF24412-B2E0-11D4-A695-00104BFF3241),
-		helpstring("Face Class")
-	]
-	coclass Face
-	{
-		[default] interface IFace1;
-		interface IFace2;
-		interface IFace3;
-	};
-};
+// MultiFace.idl : IDL source for MultiFace.dll
+//
+
+// This file will be processed by the MIDL tool to
+// produce the type library (MultiFace.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+	
+	[
+		object,
+		uuid(9BF2440F-B2E0-11D4-A695-00104BFF3241),
+		dual,
+		helpstring("IFace1 Interface"),
+		pointer_default(unique)
+	]
+	interface IFace1 : IDispatch
+	{
+		[propget, id(1), helpstring("property Face1Name")] HRESULT Face1Name([out, retval] BSTR *pVal);
+		[propput, id(1), helpstring("property Face1Name")] HRESULT Face1Name([in] BSTR newVal);
+	};
+
+	[
+		object,
+		uuid(9BF24410-B2E0-11D4-A695-00104BFF3241),
+		dual,
+		helpstring("IFace2 Interface"),
+		pointer_default(unique)
+	]
+	interface IFace2 : IDispatch
+	{
+		[propget, id(1), helpstring("property Face2Nam")] HRESULT Face2Nam([out, retval] BSTR *pVal);
+		[propput, id(1), helpstring("property Face2Nam")] HRESULT Face2Nam([in] BSTR newVal);
+	};
+
+	[
+		object,
+		uuid(9BF24411-B2E0-11D4-A695-00104BFF3241),
+		dual,
+		helpstring("IFace3 Interface"),
+		pointer_default(unique)
+	]
+	interface IFace3 : IDispatch
+	{
+		[propget, id(1), helpstring("property Face3Name")] HRESULT Face3Name([out, retval] BSTR *pVal);
+		[propput, id(1), helpstring("property Face3Name")] HRESULT Face3Name([in] BSTR newVal);
+	};
+
+[
+	uuid(9BF24403-B2E0-11D4-A695-00104BFF3241),
+	version(1.0),
+	helpstring("MultiFace 1.0 Type Library")
+]
+library MULTIFACELib
+{
+	importlib("stdole32.tlb");
+	importlib("stdole2.tlb");
+
+	
+	[
+		uuid(9BF24412-B2E0-11D4-A695-00104BFF3241),
+		helpstring("Face Class")
+	]
+	coclass Face
+	{
+		[default] interface IFace1;
+		interface IFace2;
+		interface IFace3;
+	};
+};
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.ncb b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.ncb
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.ncb
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.ncb
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.opt b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.opt
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.opt
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.opt
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.plg b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.plg
similarity index 96%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.plg
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.plg
index 5ade7bc..b9aad38 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.plg
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.plg
@@ -1,48 +1,48 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: MultiFace - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\TEMP\RSP335.tmp" with contents
-[
-/nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"Debug/MultiFace.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ     /c 
-"D:\jacob_15\samples\test\atl\MultiFace\MultiFace.cpp"
-"D:\jacob_15\samples\test\atl\MultiFace\Face.cpp"
-]
-Creating command line "cl.exe @C:\TEMP\RSP335.tmp" 
-Creating temporary file "C:\TEMP\RSP336.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"Debug/MultiFace.pdb" /debug /machine:I386 /def:".\MultiFace.def" /out:"Debug/MultiFace.dll" /implib:"Debug/MultiFace.lib" /pdbtype:sept 
-.\Debug\StdAfx.obj
-.\Debug\MultiFace.obj
-.\Debug\MultiFace.res
-.\Debug\Face.obj
-]
-Creating command line "link.exe @C:\TEMP\RSP336.tmp"
-Creating temporary file "C:\TEMP\RSP337.bat" with contents
-[
-@echo off
-regsvr32 /s /c ".\Debug\MultiFace.dll"
-echo regsvr32 exec. time > ".\Debug\regsvr32.trg"
-]
-Creating command line "C:\TEMP\RSP337.bat"
-Compiling...
-MultiFace.cpp
-Face.cpp
-Generating Code...
-Linking...
-<h3>Output Window</h3>
-Performing registration
-RegSvr32: DllRegisterServer in .\Debug\MultiFace.dll succeeded.
-
-
-
-
-<h3>Results</h3>
-MultiFace.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: MultiFace - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\TEMP\RSP335.tmp" with contents
+[
+/nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fp"Debug/MultiFace.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ     /c 
+"D:\jacob_15\samples\test\atl\MultiFace\MultiFace.cpp"
+"D:\jacob_15\samples\test\atl\MultiFace\Face.cpp"
+]
+Creating command line "cl.exe @C:\TEMP\RSP335.tmp" 
+Creating temporary file "C:\TEMP\RSP336.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"Debug/MultiFace.pdb" /debug /machine:I386 /def:".\MultiFace.def" /out:"Debug/MultiFace.dll" /implib:"Debug/MultiFace.lib" /pdbtype:sept 
+.\Debug\StdAfx.obj
+.\Debug\MultiFace.obj
+.\Debug\MultiFace.res
+.\Debug\Face.obj
+]
+Creating command line "link.exe @C:\TEMP\RSP336.tmp"
+Creating temporary file "C:\TEMP\RSP337.bat" with contents
+[
+@echo off
+regsvr32 /s /c ".\Debug\MultiFace.dll"
+echo regsvr32 exec. time > ".\Debug\regsvr32.trg"
+]
+Creating command line "C:\TEMP\RSP337.bat"
+Compiling...
+MultiFace.cpp
+Face.cpp
+Generating Code...
+Linking...
+<h3>Output Window</h3>
+Performing registration
+RegSvr32: DllRegisterServer in .\Debug\MultiFace.dll succeeded.
+
+
+
+
+<h3>Results</h3>
+MultiFace.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.rc b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.rc
similarity index 95%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.rc
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.rc
index db11272..05d1eb1 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFace.rc
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.rc
@@ -1,125 +1,125 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "1 TYPELIB ""MultiFace.tlb""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "MultiFace Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "MultiFace\0"
-            VALUE "LegalCopyright", "Copyright 2000\0"
-            VALUE "OriginalFilename", "MultiFace.DLL\0"
-            VALUE "ProductName", "MultiFace Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "OLESelfRegister", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_Face                REGISTRY DISCARDABLE    "Face.rgs"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_PROJNAME            "MultiFace"
-    IDS_FACE_DESC           "Face Class"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-1 TYPELIB "MultiFace.tlb"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "1 TYPELIB ""MultiFace.tlb""\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "MultiFace Module\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "MultiFace\0"
+            VALUE "LegalCopyright", "Copyright 2000\0"
+            VALUE "OriginalFilename", "MultiFace.DLL\0"
+            VALUE "ProductName", "MultiFace Module\0"
+            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "OLESelfRegister", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// REGISTRY
+//
+
+IDR_Face                REGISTRY DISCARDABLE    "Face.rgs"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_PROJNAME            "MultiFace"
+    IDS_FACE_DESC           "Face Class"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+1 TYPELIB "MultiFace.tlb"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace.tlb b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace.tlb
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace.tlb
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace.tlb
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace_i.c b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace_i.c
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace_i.c
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace_i.c
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFace_p.c b/src/sample/com/jacob/samples/atl/MultiFace/MultiFace_p.c
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFace_p.c
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFace_p.c
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFaceps.def b/src/sample/com/jacob/samples/atl/MultiFace/MultiFaceps.def
similarity index 95%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFaceps.def
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFaceps.def
index 6c1fe81..b256343 100644
--- a/samples/com/jacob/samples/atl/MultiFace/MultiFaceps.def
+++ b/src/sample/com/jacob/samples/atl/MultiFace/MultiFaceps.def
@@ -1,11 +1,11 @@
-
-LIBRARY      "MultiFacePS"
-
-DESCRIPTION  'Proxy/Stub DLL'
-
-EXPORTS
-	DllGetClassObject       @1	PRIVATE
-	DllCanUnloadNow         @2	PRIVATE
-	GetProxyDllInfo         @3	PRIVATE
-	DllRegisterServer		@4	PRIVATE
-	DllUnregisterServer		@5	PRIVATE
+
+LIBRARY      "MultiFacePS"
+
+DESCRIPTION  'Proxy/Stub DLL'
+
+EXPORTS
+	DllGetClassObject       @1	PRIVATE
+	DllCanUnloadNow         @2	PRIVATE
+	GetProxyDllInfo         @3	PRIVATE
+	DllRegisterServer		@4	PRIVATE
+	DllUnregisterServer		@5	PRIVATE
diff --git a/samples/com/jacob/samples/atl/MultiFace/MultiFaceps.mk b/src/sample/com/jacob/samples/atl/MultiFace/MultiFaceps.mk
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/MultiFaceps.mk
rename to src/sample/com/jacob/samples/atl/MultiFace/MultiFaceps.mk
diff --git a/samples/com/jacob/samples/atl/MultiFace/StdAfx.cpp b/src/sample/com/jacob/samples/atl/MultiFace/StdAfx.cpp
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/StdAfx.cpp
rename to src/sample/com/jacob/samples/atl/MultiFace/StdAfx.cpp
diff --git a/samples/com/jacob/samples/atl/MultiFace/StdAfx.h b/src/sample/com/jacob/samples/atl/MultiFace/StdAfx.h
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/StdAfx.h
rename to src/sample/com/jacob/samples/atl/MultiFace/StdAfx.h
diff --git a/samples/com/jacob/samples/atl/MultiFace/dlldata.c b/src/sample/com/jacob/samples/atl/MultiFace/dlldata.c
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/dlldata.c
rename to src/sample/com/jacob/samples/atl/MultiFace/dlldata.c
diff --git a/samples/com/jacob/samples/atl/MultiFace/resource.h b/src/sample/com/jacob/samples/atl/MultiFace/resource.h
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFace/resource.h
rename to src/sample/com/jacob/samples/atl/MultiFace/resource.h
diff --git a/samples/com/jacob/samples/atl/MultiFaceTest.java b/src/sample/com/jacob/samples/atl/MultiFaceTest.java
similarity index 100%
rename from samples/com/jacob/samples/atl/MultiFaceTest.java
rename to src/sample/com/jacob/samples/atl/MultiFaceTest.java
diff --git a/samples/com/jacob/samples/atl/readme.txt b/src/sample/com/jacob/samples/atl/readme.txt
similarity index 100%
rename from samples/com/jacob/samples/atl/readme.txt
rename to src/sample/com/jacob/samples/atl/readme.txt
diff --git a/samples/com/jacob/samples/office/ExcelDispatchTest.java b/src/sample/com/jacob/samples/office/ExcelDispatchTest.java
similarity index 100%
rename from samples/com/jacob/samples/office/ExcelDispatchTest.java
rename to src/sample/com/jacob/samples/office/ExcelDispatchTest.java
diff --git a/samples/com/jacob/samples/office/TestDocument.doc b/src/sample/com/jacob/samples/office/TestDocument.doc
similarity index 100%
rename from samples/com/jacob/samples/office/TestDocument.doc
rename to src/sample/com/jacob/samples/office/TestDocument.doc
diff --git a/samples/com/jacob/samples/office/VisioPrintTest.java b/src/sample/com/jacob/samples/office/VisioPrintTest.java
similarity index 100%
rename from samples/com/jacob/samples/office/VisioPrintTest.java
rename to src/sample/com/jacob/samples/office/VisioPrintTest.java
diff --git a/samples/com/jacob/samples/office/WordDocumentProperties.java b/src/sample/com/jacob/samples/office/WordDocumentProperties.java
similarity index 100%
rename from samples/com/jacob/samples/office/WordDocumentProperties.java
rename to src/sample/com/jacob/samples/office/WordDocumentProperties.java
diff --git a/samples/com/jacob/samples/outlook/Outlook.java b/src/sample/com/jacob/samples/outlook/Outlook.java
similarity index 100%
rename from samples/com/jacob/samples/outlook/Outlook.java
rename to src/sample/com/jacob/samples/outlook/Outlook.java
diff --git a/samples/com/jacob/samples/system/DiskUtils.java b/src/sample/com/jacob/samples/system/DiskUtils.java
similarity index 100%
rename from samples/com/jacob/samples/system/DiskUtils.java
rename to src/sample/com/jacob/samples/system/DiskUtils.java
diff --git a/samples/com/jacob/samples/system/SystemMonitor.java b/src/sample/com/jacob/samples/system/SystemMonitor.java
similarity index 100%
rename from samples/com/jacob/samples/system/SystemMonitor.java
rename to src/sample/com/jacob/samples/system/SystemMonitor.java
diff --git a/samples/com/jacob/samples/visio/VisioApp.java b/src/sample/com/jacob/samples/visio/VisioApp.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioApp.java
rename to src/sample/com/jacob/samples/visio/VisioApp.java
diff --git a/samples/com/jacob/samples/visio/VisioAppFacade.java b/src/sample/com/jacob/samples/visio/VisioAppFacade.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioAppFacade.java
rename to src/sample/com/jacob/samples/visio/VisioAppFacade.java
diff --git a/samples/com/jacob/samples/visio/VisioDemo.java b/src/sample/com/jacob/samples/visio/VisioDemo.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioDemo.java
rename to src/sample/com/jacob/samples/visio/VisioDemo.java
diff --git a/samples/com/jacob/samples/visio/VisioEventAdapter.java b/src/sample/com/jacob/samples/visio/VisioEventAdapter.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioEventAdapter.java
rename to src/sample/com/jacob/samples/visio/VisioEventAdapter.java
diff --git a/samples/com/jacob/samples/visio/VisioEventListener.java b/src/sample/com/jacob/samples/visio/VisioEventListener.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioEventListener.java
rename to src/sample/com/jacob/samples/visio/VisioEventListener.java
diff --git a/samples/com/jacob/samples/visio/VisioException.java b/src/sample/com/jacob/samples/visio/VisioException.java
similarity index 100%
rename from samples/com/jacob/samples/visio/VisioException.java
rename to src/sample/com/jacob/samples/visio/VisioException.java
diff --git a/samples/com/jacob/samples/visio/test_drawing.vsd b/src/sample/com/jacob/samples/visio/test_drawing.vsd
similarity index 100%
rename from samples/com/jacob/samples/visio/test_drawing.vsd
rename to src/sample/com/jacob/samples/visio/test_drawing.vsd