diff --git a/samples/com/jacob/samples/test/Outlook.java b/samples/com/jacob/samples/outlook/Outlook.java
similarity index 98%
rename from samples/com/jacob/samples/test/Outlook.java
rename to samples/com/jacob/samples/outlook/Outlook.java
index d26a44c..4d82bd4 100644
--- a/samples/com/jacob/samples/test/Outlook.java
+++ b/samples/com/jacob/samples/outlook/Outlook.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.samples.outlook;
 
 /**
  * JACOB Outlook sample contributed by
diff --git a/unittest/com/jacob/com/README.txt b/unittest/com/jacob/com/README.txt
new file mode 100644
index 0000000..a958f59
--- /dev/null
+++ b/unittest/com/jacob/com/README.txt
@@ -0,0 +1 @@
+This package exists in case folks need to test the Jacob COM objects and need access to protected methods
\ No newline at end of file
diff --git a/samples/com/jacob/samples/test/MathProj/Math.cls b/unittest/com/jacob/test/MathProj/Math.cls
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/Math.cls
rename to unittest/com/jacob/test/MathProj/Math.cls
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.dll b/unittest/com/jacob/test/MathProj/MathTest.dll
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/MathTest.dll
rename to unittest/com/jacob/test/MathProj/MathTest.dll
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.exp b/unittest/com/jacob/test/MathProj/MathTest.exp
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/MathTest.exp
rename to unittest/com/jacob/test/MathProj/MathTest.exp
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.java b/unittest/com/jacob/test/MathProj/MathTest.java
similarity index 97%
rename from samples/com/jacob/samples/test/MathProj/MathTest.java
rename to unittest/com/jacob/test/MathProj/MathTest.java
index 5428915..ffae5f4 100644
--- a/samples/com/jacob/samples/test/MathProj/MathTest.java
+++ b/unittest/com/jacob/test/MathProj/MathTest.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test.MathProj;
+package com.jacob.test.MathProj;
 
 import com.jacob.activeX.ActiveXComponent;
 import com.jacob.com.*;
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.lib b/unittest/com/jacob/test/MathProj/MathTest.lib
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/MathTest.lib
rename to unittest/com/jacob/test/MathProj/MathTest.lib
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.vbp b/unittest/com/jacob/test/MathProj/MathTest.vbp
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/MathTest.vbp
rename to unittest/com/jacob/test/MathProj/MathTest.vbp
diff --git a/samples/com/jacob/samples/test/MathProj/MathTest.vbw b/unittest/com/jacob/test/MathProj/MathTest.vbw
similarity index 100%
rename from samples/com/jacob/samples/test/MathProj/MathTest.vbw
rename to unittest/com/jacob/test/MathProj/MathTest.vbw
diff --git a/samples/com/jacob/samples/test/MathProj/README.txt b/unittest/com/jacob/test/MathProj/README.txt
similarity index 61%
rename from samples/com/jacob/samples/test/MathProj/README.txt
rename to unittest/com/jacob/test/MathProj/README.txt
index 12e81ce..b79277e 100644
--- a/samples/com/jacob/samples/test/MathProj/README.txt
+++ b/unittest/com/jacob/test/MathProj/README.txt
@@ -2,4 +2,4 @@ A Simple VB COM DLL that exposes two methods and raises events.
 
 The dll must be registered with your system
 
-Run --> regsvr32 <path>\com\jacob\samples\test\MathProj\MathTest.dll
\ No newline at end of file
+Run --> regsvr32 <path>\com\jacob\test\MathProj\MathTest.dll
\ No newline at end of file
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/Face.cpp b/unittest/com/jacob/test/atl/MultiFace/Face.cpp
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/Face.cpp
rename to unittest/com/jacob/test/atl/MultiFace/Face.cpp
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/Face.h b/unittest/com/jacob/test/atl/MultiFace/Face.h
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/Face.h
rename to unittest/com/jacob/test/atl/MultiFace/Face.h
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/Face.rgs b/unittest/com/jacob/test/atl/MultiFace/Face.rgs
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/Face.rgs
rename to unittest/com/jacob/test/atl/MultiFace/Face.rgs
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.aps b/unittest/com/jacob/test/atl/MultiFace/MultiFace.aps
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.aps
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.aps
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.cpp b/unittest/com/jacob/test/atl/MultiFace/MultiFace.cpp
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.cpp
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.cpp
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.def b/unittest/com/jacob/test/atl/MultiFace/MultiFace.def
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.def
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.def
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.dsp b/unittest/com/jacob/test/atl/MultiFace/MultiFace.dsp
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.dsp
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.dsp
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.dsw b/unittest/com/jacob/test/atl/MultiFace/MultiFace.dsw
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.dsw
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.dsw
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.h b/unittest/com/jacob/test/atl/MultiFace/MultiFace.h
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.h
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.h
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.idl b/unittest/com/jacob/test/atl/MultiFace/MultiFace.idl
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.idl
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.idl
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.ncb b/unittest/com/jacob/test/atl/MultiFace/MultiFace.ncb
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.ncb
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.ncb
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.opt b/unittest/com/jacob/test/atl/MultiFace/MultiFace.opt
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.opt
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.opt
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.plg b/unittest/com/jacob/test/atl/MultiFace/MultiFace.plg
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.plg
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.plg
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.rc b/unittest/com/jacob/test/atl/MultiFace/MultiFace.rc
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.rc
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.rc
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace.tlb b/unittest/com/jacob/test/atl/MultiFace/MultiFace.tlb
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace.tlb
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace.tlb
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace_i.c b/unittest/com/jacob/test/atl/MultiFace/MultiFace_i.c
similarity index 95%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace_i.c
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace_i.c
index afa8b14..6fb00ca 100644
--- a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace_i.c
+++ b/unittest/com/jacob/test/atl/MultiFace/MultiFace_i.c
@@ -1,56 +1,56 @@
-/* this file contains the actual definitions of */
-/* the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
-/* File created by MIDL compiler version 5.01.0164 */
-/* at Sun Nov 05 01:12:47 2000
- */
-/* Compiler settings for D:\jacob_15\samples\test\atl\MultiFace\MultiFace.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
-*/
-//@@MIDL_FILE_HEADING(  )
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
-    unsigned long x;
-    unsigned short s1;
-    unsigned short s2;
-    unsigned char  c[8];
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-const IID IID_IFace1 = {0x9BF2440F,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
-
-
-const IID IID_IFace2 = {0x9BF24410,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
-
-
-const IID IID_IFace3 = {0x9BF24411,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
-
-
-const IID LIBID_MULTIFACELib = {0x9BF24403,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
-
-
-const CLSID CLSID_Face = {0x9BF24412,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
-
-
-#ifdef __cplusplus
-}
-#endif
-
+/* this file contains the actual definitions of */
+/* the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+/* File created by MIDL compiler version 5.01.0164 */
+/* at Sun Nov 05 01:12:47 2000
+ */
+/* Compiler settings for D:\jacob_15\samples\test\atl\MultiFace\MultiFace.idl:
+    Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data 
+*/
+//@@MIDL_FILE_HEADING(  )
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+const IID IID_IFace1 = {0x9BF2440F,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
+
+
+const IID IID_IFace2 = {0x9BF24410,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
+
+
+const IID IID_IFace3 = {0x9BF24411,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
+
+
+const IID LIBID_MULTIFACELib = {0x9BF24403,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
+
+
+const CLSID CLSID_Face = {0x9BF24412,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}};
+
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace_p.c b/unittest/com/jacob/test/atl/MultiFace/MultiFace_p.c
similarity index 95%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFace_p.c
rename to unittest/com/jacob/test/atl/MultiFace/MultiFace_p.c
index e83ec80..58b87e7 100644
--- a/samples/com/jacob/samples/test/atl/MultiFace/MultiFace_p.c
+++ b/unittest/com/jacob/test/atl/MultiFace/MultiFace_p.c
@@ -1,570 +1,570 @@
-/* this ALWAYS GENERATED file contains the proxy stub code */
-
-
-/* File created by MIDL compiler version 5.01.0164 */
-/* at Sun Nov 05 01:12:47 2000
- */
-/* Compiler settings for D:\jacob_15\samples\test\atl\MultiFace\MultiFace.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#define USE_STUBLESS_PROXY
-
-
-/* verify that the <rpcproxy.h> version is high enough to compile this file*/
-#ifndef __REDQ_RPCPROXY_H_VERSION__
-#define __REQUIRED_RPCPROXY_H_VERSION__ 440
-#endif
-
-
-#include "rpcproxy.h"
-#ifndef __RPCPROXY_H_VERSION__
-#error this stub requires an updated version of <rpcproxy.h>
-#endif // __RPCPROXY_H_VERSION__
-
-
-#include "MultiFace.h"
-
-#define TYPE_FORMAT_STRING_SIZE   55                                
-#define PROC_FORMAT_STRING_SIZE   57                                
-
-typedef struct _MIDL_TYPE_FORMAT_STRING
-    {
-    short          Pad;
-    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
-    } MIDL_TYPE_FORMAT_STRING;
-
-typedef struct _MIDL_PROC_FORMAT_STRING
-    {
-    short          Pad;
-    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
-    } MIDL_PROC_FORMAT_STRING;
-
-
-extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
-extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
-
-
-/* Object interface: IUnknown, ver. 0.0,
-   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
-
-
-/* Object interface: IDispatch, ver. 0.0,
-   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
-
-
-/* Object interface: IFace1, ver. 0.0,
-   GUID={0x9BF2440F,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
-
-
-extern const MIDL_STUB_DESC Object_StubDesc;
-
-
-extern const MIDL_SERVER_INFO IFace1_ServerInfo;
-
-#pragma code_seg(".orpc")
-static const unsigned short IFace1_FormatStringOffsetTable[] = 
-    {
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    0,
-    28
-    };
-
-static const MIDL_SERVER_INFO IFace1_ServerInfo = 
-    {
-    &Object_StubDesc,
-    0,
-    __MIDL_ProcFormatString.Format,
-    &IFace1_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0,
-    0
-    };
-
-static const MIDL_STUBLESS_PROXY_INFO IFace1_ProxyInfo =
-    {
-    &Object_StubDesc,
-    __MIDL_ProcFormatString.Format,
-    &IFace1_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0
-    };
-
-CINTERFACE_PROXY_VTABLE(9) _IFace1ProxyVtbl = 
-{
-    &IFace1_ProxyInfo,
-    &IID_IFace1,
-    IUnknown_QueryInterface_Proxy,
-    IUnknown_AddRef_Proxy,
-    IUnknown_Release_Proxy ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
-    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
-    0 /* IDispatch_Invoke_Proxy */ ,
-    (void *)-1 /* IFace1::get_Face1Name */ ,
-    (void *)-1 /* IFace1::put_Face1Name */
-};
-
-
-static const PRPC_STUB_FUNCTION IFace1_table[] =
-{
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    NdrStubCall2,
-    NdrStubCall2
-};
-
-CInterfaceStubVtbl _IFace1StubVtbl =
-{
-    &IID_IFace1,
-    &IFace1_ServerInfo,
-    9,
-    &IFace1_table[-3],
-    CStdStubBuffer_DELEGATING_METHODS
-};
-
-
-/* Object interface: IFace2, ver. 0.0,
-   GUID={0x9BF24410,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
-
-
-extern const MIDL_STUB_DESC Object_StubDesc;
-
-
-extern const MIDL_SERVER_INFO IFace2_ServerInfo;
-
-#pragma code_seg(".orpc")
-static const unsigned short IFace2_FormatStringOffsetTable[] = 
-    {
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    0,
-    28
-    };
-
-static const MIDL_SERVER_INFO IFace2_ServerInfo = 
-    {
-    &Object_StubDesc,
-    0,
-    __MIDL_ProcFormatString.Format,
-    &IFace2_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0,
-    0
-    };
-
-static const MIDL_STUBLESS_PROXY_INFO IFace2_ProxyInfo =
-    {
-    &Object_StubDesc,
-    __MIDL_ProcFormatString.Format,
-    &IFace2_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0
-    };
-
-CINTERFACE_PROXY_VTABLE(9) _IFace2ProxyVtbl = 
-{
-    &IFace2_ProxyInfo,
-    &IID_IFace2,
-    IUnknown_QueryInterface_Proxy,
-    IUnknown_AddRef_Proxy,
-    IUnknown_Release_Proxy ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
-    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
-    0 /* IDispatch_Invoke_Proxy */ ,
-    (void *)-1 /* IFace2::get_Face2Nam */ ,
-    (void *)-1 /* IFace2::put_Face2Nam */
-};
-
-
-static const PRPC_STUB_FUNCTION IFace2_table[] =
-{
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    NdrStubCall2,
-    NdrStubCall2
-};
-
-CInterfaceStubVtbl _IFace2StubVtbl =
-{
-    &IID_IFace2,
-    &IFace2_ServerInfo,
-    9,
-    &IFace2_table[-3],
-    CStdStubBuffer_DELEGATING_METHODS
-};
-
-
-/* Object interface: IFace3, ver. 0.0,
-   GUID={0x9BF24411,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
-
-
-extern const MIDL_STUB_DESC Object_StubDesc;
-
-
-extern const MIDL_SERVER_INFO IFace3_ServerInfo;
-
-#pragma code_seg(".orpc")
-extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1];
-
-static const MIDL_STUB_DESC Object_StubDesc = 
-    {
-    0,
-    NdrOleAllocate,
-    NdrOleFree,
-    0,
-    0,
-    0,
-    0,
-    0,
-    __MIDL_TypeFormatString.Format,
-    1, /* -error bounds_check flag */
-    0x20000, /* Ndr library version */
-    0,
-    0x50100a4, /* MIDL Version 5.1.164 */
-    0,
-    UserMarshalRoutines,
-    0,  /* notify & notify_flag routine table */
-    1,  /* Flags */
-    0,  /* Reserved3 */
-    0,  /* Reserved4 */
-    0   /* Reserved5 */
-    };
-
-static const unsigned short IFace3_FormatStringOffsetTable[] = 
-    {
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    (unsigned short) -1,
-    0,
-    28
-    };
-
-static const MIDL_SERVER_INFO IFace3_ServerInfo = 
-    {
-    &Object_StubDesc,
-    0,
-    __MIDL_ProcFormatString.Format,
-    &IFace3_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0,
-    0
-    };
-
-static const MIDL_STUBLESS_PROXY_INFO IFace3_ProxyInfo =
-    {
-    &Object_StubDesc,
-    __MIDL_ProcFormatString.Format,
-    &IFace3_FormatStringOffsetTable[-3],
-    0,
-    0,
-    0
-    };
-
-CINTERFACE_PROXY_VTABLE(9) _IFace3ProxyVtbl = 
-{
-    &IFace3_ProxyInfo,
-    &IID_IFace3,
-    IUnknown_QueryInterface_Proxy,
-    IUnknown_AddRef_Proxy,
-    IUnknown_Release_Proxy ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
-    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
-    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
-    0 /* IDispatch_Invoke_Proxy */ ,
-    (void *)-1 /* IFace3::get_Face3Name */ ,
-    (void *)-1 /* IFace3::put_Face3Name */
-};
-
-
-static const PRPC_STUB_FUNCTION IFace3_table[] =
-{
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    STUB_FORWARDING_FUNCTION,
-    NdrStubCall2,
-    NdrStubCall2
-};
-
-CInterfaceStubVtbl _IFace3StubVtbl =
-{
-    &IID_IFace3,
-    &IFace3_ServerInfo,
-    9,
-    &IFace3_table[-3],
-    CStdStubBuffer_DELEGATING_METHODS
-};
-
-#pragma data_seg(".rdata")
-
-static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1] = 
-        {
-            
-            {
-            BSTR_UserSize
-            ,BSTR_UserMarshal
-            ,BSTR_UserUnmarshal
-            ,BSTR_UserFree
-            }
-
-        };
-
-
-#if !defined(__RPC_WIN32__)
-#error  Invalid build platform for this stub.
-#endif
-
-#if !(TARGET_IS_NT40_OR_LATER)
-#error You need a Windows NT 4.0 or later to run this stub because it uses these features:
-#error   -Oif or -Oicf, [wire_marshal] or [user_marshal] attribute, more than 32 methods in the interface.
-#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.
-#error This app will die there with the RPC_X_WRONG_STUB_VERSION error.
-#endif
-
-
-static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
-    {
-        0,
-        {
-
-	/* Procedure get_Face3Name */
-
-
-	/* Procedure get_Face2Nam */
-
-
-	/* Procedure get_Face1Name */
-
-			0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
-/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
-#ifndef _ALPHA_
-/*  8 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 14 */	0x5,		/* Oi2 Flags:  srv must size, has return, */
-			0x2,		/* 2 */
-
-	/* Parameter pVal */
-
-
-	/* Parameter pVal */
-
-
-	/* Parameter pVal */
-
-/* 16 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
-#ifndef _ALPHA_
-/* 18 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-/* 20 */	NdrFcShort( 0x1e ),	/* Type Offset=30 */
-
-	/* Return value */
-
-
-	/* Return value */
-
-
-	/* Return value */
-
-/* 22 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-/* 24 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-/* 26 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
-
-	/* Procedure put_Face3Name */
-
-
-	/* Procedure put_Face2Nam */
-
-
-	/* Procedure put_Face1Name */
-
-/* 28 */	0x33,		/* FC_AUTO_HANDLE */
-			0x6c,		/* Old Flags:  object, Oi2 */
-/* 30 */	NdrFcLong( 0x0 ),	/* 0 */
-/* 34 */	NdrFcShort( 0x8 ),	/* 8 */
-#ifndef _ALPHA_
-/* 36 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-/* 38 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 40 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 42 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
-			0x2,		/* 2 */
-
-	/* Parameter newVal */
-
-
-	/* Parameter newVal */
-
-
-	/* Parameter newVal */
-
-/* 44 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
-#ifndef _ALPHA_
-/* 46 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-/* 48 */	NdrFcShort( 0x2c ),	/* Type Offset=44 */
-
-	/* Return value */
-
-
-	/* Return value */
-
-
-	/* Return value */
-
-/* 50 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-/* 52 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-/* 54 */	0x8,		/* FC_LONG */
-			0x0,		/* 0 */
-
-			0x0
-        }
-    };
-
-static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
-    {
-        0,
-        {
-			NdrFcShort( 0x0 ),	/* 0 */
-/*  2 */	
-			0x11, 0x4,	/* FC_RP [alloced_on_stack] */
-/*  4 */	NdrFcShort( 0x1a ),	/* Offset= 26 (30) */
-/*  6 */	
-			0x13, 0x0,	/* FC_OP */
-/*  8 */	NdrFcShort( 0xc ),	/* Offset= 12 (20) */
-/* 10 */	
-			0x1b,		/* FC_CARRAY */
-			0x1,		/* 1 */
-/* 12 */	NdrFcShort( 0x2 ),	/* 2 */
-/* 14 */	0x9,		/* Corr desc: FC_ULONG */
-			0x0,		/*  */
-/* 16 */	NdrFcShort( 0xfffc ),	/* -4 */
-/* 18 */	0x6,		/* FC_SHORT */
-			0x5b,		/* FC_END */
-/* 20 */	
-			0x17,		/* FC_CSTRUCT */
-			0x3,		/* 3 */
-/* 22 */	NdrFcShort( 0x8 ),	/* 8 */
-/* 24 */	NdrFcShort( 0xfffffff2 ),	/* Offset= -14 (10) */
-/* 26 */	0x8,		/* FC_LONG */
-			0x8,		/* FC_LONG */
-/* 28 */	0x5c,		/* FC_PAD */
-			0x5b,		/* FC_END */
-/* 30 */	0xb4,		/* FC_USER_MARSHAL */
-			0x83,		/* 131 */
-/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 34 */	NdrFcShort( 0x4 ),	/* 4 */
-/* 36 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 38 */	NdrFcShort( 0xffffffe0 ),	/* Offset= -32 (6) */
-/* 40 */	
-			0x12, 0x0,	/* FC_UP */
-/* 42 */	NdrFcShort( 0xffffffea ),	/* Offset= -22 (20) */
-/* 44 */	0xb4,		/* FC_USER_MARSHAL */
-			0x83,		/* 131 */
-/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 48 */	NdrFcShort( 0x4 ),	/* 4 */
-/* 50 */	NdrFcShort( 0x0 ),	/* 0 */
-/* 52 */	NdrFcShort( 0xfffffff4 ),	/* Offset= -12 (40) */
-
-			0x0
-        }
-    };
-
-const CInterfaceProxyVtbl * _MultiFace_ProxyVtblList[] = 
-{
-    ( CInterfaceProxyVtbl *) &_IFace1ProxyVtbl,
-    ( CInterfaceProxyVtbl *) &_IFace2ProxyVtbl,
-    ( CInterfaceProxyVtbl *) &_IFace3ProxyVtbl,
-    0
-};
-
-const CInterfaceStubVtbl * _MultiFace_StubVtblList[] = 
-{
-    ( CInterfaceStubVtbl *) &_IFace1StubVtbl,
-    ( CInterfaceStubVtbl *) &_IFace2StubVtbl,
-    ( CInterfaceStubVtbl *) &_IFace3StubVtbl,
-    0
-};
-
-PCInterfaceName const _MultiFace_InterfaceNamesList[] = 
-{
-    "IFace1",
-    "IFace2",
-    "IFace3",
-    0
-};
-
-const IID *  _MultiFace_BaseIIDList[] = 
-{
-    &IID_IDispatch,
-    &IID_IDispatch,
-    &IID_IDispatch,
-    0
-};
-
-
-#define _MultiFace_CHECK_IID(n)	IID_GENERIC_CHECK_IID( _MultiFace, pIID, n)
-
-int __stdcall _MultiFace_IID_Lookup( const IID * pIID, int * pIndex )
-{
-    IID_BS_LOOKUP_SETUP
-
-    IID_BS_LOOKUP_INITIAL_TEST( _MultiFace, 3, 2 )
-    IID_BS_LOOKUP_NEXT_TEST( _MultiFace, 1 )
-    IID_BS_LOOKUP_RETURN_RESULT( _MultiFace, 3, *pIndex )
-    
-}
-
-const ExtendedProxyFileInfo MultiFace_ProxyFileInfo = 
-{
-    (PCInterfaceProxyVtblList *) & _MultiFace_ProxyVtblList,
-    (PCInterfaceStubVtblList *) & _MultiFace_StubVtblList,
-    (const PCInterfaceName * ) & _MultiFace_InterfaceNamesList,
-    (const IID ** ) & _MultiFace_BaseIIDList,
-    & _MultiFace_IID_Lookup, 
-    3,
-    2,
-    0, /* table of [async_uuid] interfaces */
-    0, /* Filler1 */
-    0, /* Filler2 */
-    0  /* Filler3 */
-};
+/* this ALWAYS GENERATED file contains the proxy stub code */
+
+
+/* File created by MIDL compiler version 5.01.0164 */
+/* at Sun Nov 05 01:12:47 2000
+ */
+/* Compiler settings for D:\jacob_15\samples\test\atl\MultiFace\MultiFace.idl:
+    Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data 
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#define USE_STUBLESS_PROXY
+
+
+/* verify that the <rpcproxy.h> version is high enough to compile this file*/
+#ifndef __REDQ_RPCPROXY_H_VERSION__
+#define __REQUIRED_RPCPROXY_H_VERSION__ 440
+#endif
+
+
+#include "rpcproxy.h"
+#ifndef __RPCPROXY_H_VERSION__
+#error this stub requires an updated version of <rpcproxy.h>
+#endif // __RPCPROXY_H_VERSION__
+
+
+#include "MultiFace.h"
+
+#define TYPE_FORMAT_STRING_SIZE   55                                
+#define PROC_FORMAT_STRING_SIZE   57                                
+
+typedef struct _MIDL_TYPE_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ TYPE_FORMAT_STRING_SIZE ];
+    } MIDL_TYPE_FORMAT_STRING;
+
+typedef struct _MIDL_PROC_FORMAT_STRING
+    {
+    short          Pad;
+    unsigned char  Format[ PROC_FORMAT_STRING_SIZE ];
+    } MIDL_PROC_FORMAT_STRING;
+
+
+extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
+extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
+
+
+/* Object interface: IUnknown, ver. 0.0,
+   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: IDispatch, ver. 0.0,
+   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
+
+
+/* Object interface: IFace1, ver. 0.0,
+   GUID={0x9BF2440F,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
+
+
+extern const MIDL_STUB_DESC Object_StubDesc;
+
+
+extern const MIDL_SERVER_INFO IFace1_ServerInfo;
+
+#pragma code_seg(".orpc")
+static const unsigned short IFace1_FormatStringOffsetTable[] = 
+    {
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    0,
+    28
+    };
+
+static const MIDL_SERVER_INFO IFace1_ServerInfo = 
+    {
+    &Object_StubDesc,
+    0,
+    __MIDL_ProcFormatString.Format,
+    &IFace1_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0,
+    0
+    };
+
+static const MIDL_STUBLESS_PROXY_INFO IFace1_ProxyInfo =
+    {
+    &Object_StubDesc,
+    __MIDL_ProcFormatString.Format,
+    &IFace1_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0
+    };
+
+CINTERFACE_PROXY_VTABLE(9) _IFace1ProxyVtbl = 
+{
+    &IFace1_ProxyInfo,
+    &IID_IFace1,
+    IUnknown_QueryInterface_Proxy,
+    IUnknown_AddRef_Proxy,
+    IUnknown_Release_Proxy ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
+    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
+    0 /* IDispatch_Invoke_Proxy */ ,
+    (void *)-1 /* IFace1::get_Face1Name */ ,
+    (void *)-1 /* IFace1::put_Face1Name */
+};
+
+
+static const PRPC_STUB_FUNCTION IFace1_table[] =
+{
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    NdrStubCall2,
+    NdrStubCall2
+};
+
+CInterfaceStubVtbl _IFace1StubVtbl =
+{
+    &IID_IFace1,
+    &IFace1_ServerInfo,
+    9,
+    &IFace1_table[-3],
+    CStdStubBuffer_DELEGATING_METHODS
+};
+
+
+/* Object interface: IFace2, ver. 0.0,
+   GUID={0x9BF24410,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
+
+
+extern const MIDL_STUB_DESC Object_StubDesc;
+
+
+extern const MIDL_SERVER_INFO IFace2_ServerInfo;
+
+#pragma code_seg(".orpc")
+static const unsigned short IFace2_FormatStringOffsetTable[] = 
+    {
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    0,
+    28
+    };
+
+static const MIDL_SERVER_INFO IFace2_ServerInfo = 
+    {
+    &Object_StubDesc,
+    0,
+    __MIDL_ProcFormatString.Format,
+    &IFace2_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0,
+    0
+    };
+
+static const MIDL_STUBLESS_PROXY_INFO IFace2_ProxyInfo =
+    {
+    &Object_StubDesc,
+    __MIDL_ProcFormatString.Format,
+    &IFace2_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0
+    };
+
+CINTERFACE_PROXY_VTABLE(9) _IFace2ProxyVtbl = 
+{
+    &IFace2_ProxyInfo,
+    &IID_IFace2,
+    IUnknown_QueryInterface_Proxy,
+    IUnknown_AddRef_Proxy,
+    IUnknown_Release_Proxy ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
+    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
+    0 /* IDispatch_Invoke_Proxy */ ,
+    (void *)-1 /* IFace2::get_Face2Nam */ ,
+    (void *)-1 /* IFace2::put_Face2Nam */
+};
+
+
+static const PRPC_STUB_FUNCTION IFace2_table[] =
+{
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    NdrStubCall2,
+    NdrStubCall2
+};
+
+CInterfaceStubVtbl _IFace2StubVtbl =
+{
+    &IID_IFace2,
+    &IFace2_ServerInfo,
+    9,
+    &IFace2_table[-3],
+    CStdStubBuffer_DELEGATING_METHODS
+};
+
+
+/* Object interface: IFace3, ver. 0.0,
+   GUID={0x9BF24411,0xB2E0,0x11D4,{0xA6,0x95,0x00,0x10,0x4B,0xFF,0x32,0x41}} */
+
+
+extern const MIDL_STUB_DESC Object_StubDesc;
+
+
+extern const MIDL_SERVER_INFO IFace3_ServerInfo;
+
+#pragma code_seg(".orpc")
+extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1];
+
+static const MIDL_STUB_DESC Object_StubDesc = 
+    {
+    0,
+    NdrOleAllocate,
+    NdrOleFree,
+    0,
+    0,
+    0,
+    0,
+    0,
+    __MIDL_TypeFormatString.Format,
+    1, /* -error bounds_check flag */
+    0x20000, /* Ndr library version */
+    0,
+    0x50100a4, /* MIDL Version 5.1.164 */
+    0,
+    UserMarshalRoutines,
+    0,  /* notify & notify_flag routine table */
+    1,  /* Flags */
+    0,  /* Reserved3 */
+    0,  /* Reserved4 */
+    0   /* Reserved5 */
+    };
+
+static const unsigned short IFace3_FormatStringOffsetTable[] = 
+    {
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    (unsigned short) -1,
+    0,
+    28
+    };
+
+static const MIDL_SERVER_INFO IFace3_ServerInfo = 
+    {
+    &Object_StubDesc,
+    0,
+    __MIDL_ProcFormatString.Format,
+    &IFace3_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0,
+    0
+    };
+
+static const MIDL_STUBLESS_PROXY_INFO IFace3_ProxyInfo =
+    {
+    &Object_StubDesc,
+    __MIDL_ProcFormatString.Format,
+    &IFace3_FormatStringOffsetTable[-3],
+    0,
+    0,
+    0
+    };
+
+CINTERFACE_PROXY_VTABLE(9) _IFace3ProxyVtbl = 
+{
+    &IFace3_ProxyInfo,
+    &IID_IFace3,
+    IUnknown_QueryInterface_Proxy,
+    IUnknown_AddRef_Proxy,
+    IUnknown_Release_Proxy ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
+    0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
+    0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
+    0 /* IDispatch_Invoke_Proxy */ ,
+    (void *)-1 /* IFace3::get_Face3Name */ ,
+    (void *)-1 /* IFace3::put_Face3Name */
+};
+
+
+static const PRPC_STUB_FUNCTION IFace3_table[] =
+{
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    STUB_FORWARDING_FUNCTION,
+    NdrStubCall2,
+    NdrStubCall2
+};
+
+CInterfaceStubVtbl _IFace3StubVtbl =
+{
+    &IID_IFace3,
+    &IFace3_ServerInfo,
+    9,
+    &IFace3_table[-3],
+    CStdStubBuffer_DELEGATING_METHODS
+};
+
+#pragma data_seg(".rdata")
+
+static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[1] = 
+        {
+            
+            {
+            BSTR_UserSize
+            ,BSTR_UserMarshal
+            ,BSTR_UserUnmarshal
+            ,BSTR_UserFree
+            }
+
+        };
+
+
+#if !defined(__RPC_WIN32__)
+#error  Invalid build platform for this stub.
+#endif
+
+#if !(TARGET_IS_NT40_OR_LATER)
+#error You need a Windows NT 4.0 or later to run this stub because it uses these features:
+#error   -Oif or -Oicf, [wire_marshal] or [user_marshal] attribute, more than 32 methods in the interface.
+#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.
+#error This app will die there with the RPC_X_WRONG_STUB_VERSION error.
+#endif
+
+
+static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
+    {
+        0,
+        {
+
+	/* Procedure get_Face3Name */
+
+
+	/* Procedure get_Face2Nam */
+
+
+	/* Procedure get_Face1Name */
+
+			0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
+/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
+#ifndef _ALPHA_
+/*  8 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+#else
+			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+#endif
+/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 14 */	0x5,		/* Oi2 Flags:  srv must size, has return, */
+			0x2,		/* 2 */
+
+	/* Parameter pVal */
+
+
+	/* Parameter pVal */
+
+
+	/* Parameter pVal */
+
+/* 16 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
+#ifndef _ALPHA_
+/* 18 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+#else
+			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+#endif
+/* 20 */	NdrFcShort( 0x1e ),	/* Type Offset=30 */
+
+	/* Return value */
+
+
+	/* Return value */
+
+
+	/* Return value */
+
+/* 22 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+#ifndef _ALPHA_
+/* 24 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+#else
+			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+#endif
+/* 26 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+	/* Procedure put_Face3Name */
+
+
+	/* Procedure put_Face2Nam */
+
+
+	/* Procedure put_Face1Name */
+
+/* 28 */	0x33,		/* FC_AUTO_HANDLE */
+			0x6c,		/* Old Flags:  object, Oi2 */
+/* 30 */	NdrFcLong( 0x0 ),	/* 0 */
+/* 34 */	NdrFcShort( 0x8 ),	/* 8 */
+#ifndef _ALPHA_
+/* 36 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
+#else
+			NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
+#endif
+/* 38 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 40 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 42 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
+			0x2,		/* 2 */
+
+	/* Parameter newVal */
+
+
+	/* Parameter newVal */
+
+
+	/* Parameter newVal */
+
+/* 44 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
+#ifndef _ALPHA_
+/* 46 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
+#else
+			NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
+#endif
+/* 48 */	NdrFcShort( 0x2c ),	/* Type Offset=44 */
+
+	/* Return value */
+
+
+	/* Return value */
+
+
+	/* Return value */
+
+/* 50 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
+#ifndef _ALPHA_
+/* 52 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
+#else
+			NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
+#endif
+/* 54 */	0x8,		/* FC_LONG */
+			0x0,		/* 0 */
+
+			0x0
+        }
+    };
+
+static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
+    {
+        0,
+        {
+			NdrFcShort( 0x0 ),	/* 0 */
+/*  2 */	
+			0x11, 0x4,	/* FC_RP [alloced_on_stack] */
+/*  4 */	NdrFcShort( 0x1a ),	/* Offset= 26 (30) */
+/*  6 */	
+			0x13, 0x0,	/* FC_OP */
+/*  8 */	NdrFcShort( 0xc ),	/* Offset= 12 (20) */
+/* 10 */	
+			0x1b,		/* FC_CARRAY */
+			0x1,		/* 1 */
+/* 12 */	NdrFcShort( 0x2 ),	/* 2 */
+/* 14 */	0x9,		/* Corr desc: FC_ULONG */
+			0x0,		/*  */
+/* 16 */	NdrFcShort( 0xfffc ),	/* -4 */
+/* 18 */	0x6,		/* FC_SHORT */
+			0x5b,		/* FC_END */
+/* 20 */	
+			0x17,		/* FC_CSTRUCT */
+			0x3,		/* 3 */
+/* 22 */	NdrFcShort( 0x8 ),	/* 8 */
+/* 24 */	NdrFcShort( 0xfffffff2 ),	/* Offset= -14 (10) */
+/* 26 */	0x8,		/* FC_LONG */
+			0x8,		/* FC_LONG */
+/* 28 */	0x5c,		/* FC_PAD */
+			0x5b,		/* FC_END */
+/* 30 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 34 */	NdrFcShort( 0x4 ),	/* 4 */
+/* 36 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 38 */	NdrFcShort( 0xffffffe0 ),	/* Offset= -32 (6) */
+/* 40 */	
+			0x12, 0x0,	/* FC_UP */
+/* 42 */	NdrFcShort( 0xffffffea ),	/* Offset= -22 (20) */
+/* 44 */	0xb4,		/* FC_USER_MARSHAL */
+			0x83,		/* 131 */
+/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 48 */	NdrFcShort( 0x4 ),	/* 4 */
+/* 50 */	NdrFcShort( 0x0 ),	/* 0 */
+/* 52 */	NdrFcShort( 0xfffffff4 ),	/* Offset= -12 (40) */
+
+			0x0
+        }
+    };
+
+const CInterfaceProxyVtbl * _MultiFace_ProxyVtblList[] = 
+{
+    ( CInterfaceProxyVtbl *) &_IFace1ProxyVtbl,
+    ( CInterfaceProxyVtbl *) &_IFace2ProxyVtbl,
+    ( CInterfaceProxyVtbl *) &_IFace3ProxyVtbl,
+    0
+};
+
+const CInterfaceStubVtbl * _MultiFace_StubVtblList[] = 
+{
+    ( CInterfaceStubVtbl *) &_IFace1StubVtbl,
+    ( CInterfaceStubVtbl *) &_IFace2StubVtbl,
+    ( CInterfaceStubVtbl *) &_IFace3StubVtbl,
+    0
+};
+
+PCInterfaceName const _MultiFace_InterfaceNamesList[] = 
+{
+    "IFace1",
+    "IFace2",
+    "IFace3",
+    0
+};
+
+const IID *  _MultiFace_BaseIIDList[] = 
+{
+    &IID_IDispatch,
+    &IID_IDispatch,
+    &IID_IDispatch,
+    0
+};
+
+
+#define _MultiFace_CHECK_IID(n)	IID_GENERIC_CHECK_IID( _MultiFace, pIID, n)
+
+int __stdcall _MultiFace_IID_Lookup( const IID * pIID, int * pIndex )
+{
+    IID_BS_LOOKUP_SETUP
+
+    IID_BS_LOOKUP_INITIAL_TEST( _MultiFace, 3, 2 )
+    IID_BS_LOOKUP_NEXT_TEST( _MultiFace, 1 )
+    IID_BS_LOOKUP_RETURN_RESULT( _MultiFace, 3, *pIndex )
+    
+}
+
+const ExtendedProxyFileInfo MultiFace_ProxyFileInfo = 
+{
+    (PCInterfaceProxyVtblList *) & _MultiFace_ProxyVtblList,
+    (PCInterfaceStubVtblList *) & _MultiFace_StubVtblList,
+    (const PCInterfaceName * ) & _MultiFace_InterfaceNamesList,
+    (const IID ** ) & _MultiFace_BaseIIDList,
+    & _MultiFace_IID_Lookup, 
+    3,
+    2,
+    0, /* table of [async_uuid] interfaces */
+    0, /* Filler1 */
+    0, /* Filler2 */
+    0  /* Filler3 */
+};
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFaceps.def b/unittest/com/jacob/test/atl/MultiFace/MultiFaceps.def
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFaceps.def
rename to unittest/com/jacob/test/atl/MultiFace/MultiFaceps.def
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/MultiFaceps.mk b/unittest/com/jacob/test/atl/MultiFace/MultiFaceps.mk
similarity index 96%
rename from samples/com/jacob/samples/test/atl/MultiFace/MultiFaceps.mk
rename to unittest/com/jacob/test/atl/MultiFace/MultiFaceps.mk
index 25de3e7..1a47615 100644
--- a/samples/com/jacob/samples/test/atl/MultiFace/MultiFaceps.mk
+++ b/unittest/com/jacob/test/atl/MultiFace/MultiFaceps.mk
@@ -1,16 +1,16 @@
-
-MultiFaceps.dll: dlldata.obj MultiFace_p.obj MultiFace_i.obj
-	link /dll /out:MultiFaceps.dll /def:MultiFaceps.def /entry:DllMain dlldata.obj MultiFace_p.obj MultiFace_i.obj \
-		kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib oleaut32.lib uuid.lib \
-
-.c.obj:
-	cl /c /Ox /DWIN32 /D_WIN32_WINNT=0x0400 /DREGISTER_PROXY_DLL \
-		$<
-
-clean:
-	@del MultiFaceps.dll
-	@del MultiFaceps.lib
-	@del MultiFaceps.exp
-	@del dlldata.obj
-	@del MultiFace_p.obj
-	@del MultiFace_i.obj
+
+MultiFaceps.dll: dlldata.obj MultiFace_p.obj MultiFace_i.obj
+	link /dll /out:MultiFaceps.dll /def:MultiFaceps.def /entry:DllMain dlldata.obj MultiFace_p.obj MultiFace_i.obj \
+		kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib oleaut32.lib uuid.lib \
+
+.c.obj:
+	cl /c /Ox /DWIN32 /D_WIN32_WINNT=0x0400 /DREGISTER_PROXY_DLL \
+		$<
+
+clean:
+	@del MultiFaceps.dll
+	@del MultiFaceps.lib
+	@del MultiFaceps.exp
+	@del dlldata.obj
+	@del MultiFace_p.obj
+	@del MultiFace_i.obj
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/StdAfx.cpp b/unittest/com/jacob/test/atl/MultiFace/StdAfx.cpp
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/StdAfx.cpp
rename to unittest/com/jacob/test/atl/MultiFace/StdAfx.cpp
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/StdAfx.h b/unittest/com/jacob/test/atl/MultiFace/StdAfx.h
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/StdAfx.h
rename to unittest/com/jacob/test/atl/MultiFace/StdAfx.h
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/dlldata.c b/unittest/com/jacob/test/atl/MultiFace/dlldata.c
similarity index 95%
rename from samples/com/jacob/samples/test/atl/MultiFace/dlldata.c
rename to unittest/com/jacob/test/atl/MultiFace/dlldata.c
index b8ef600..4671279 100644
--- a/samples/com/jacob/samples/test/atl/MultiFace/dlldata.c
+++ b/unittest/com/jacob/test/atl/MultiFace/dlldata.c
@@ -1,38 +1,38 @@
-/*********************************************************
-   DllData file -- generated by MIDL compiler 
-
-        DO NOT ALTER THIS FILE
-
-   This file is regenerated by MIDL on every IDL file compile.
-
-   To completely reconstruct this file, delete it and rerun MIDL
-   on all the IDL files in this DLL, specifying this file for the
-   /dlldata command line option
-
-*********************************************************/
-
-#define PROXY_DELEGATION
-
-#include <rpcproxy.h>
-
-#ifdef __cplusplus
-extern "C"   {
-#endif
-
-EXTERN_PROXY_FILE( MultiFace )
-
-
-PROXYFILE_LIST_START
-/* Start of list */
-  REFERENCE_PROXY_FILE( MultiFace ),
-/* End of list */
-PROXYFILE_LIST_END
-
-
-DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
-
-#ifdef __cplusplus
-}  /*extern "C" */
-#endif
-
-/* end of generated dlldata file */
+/*********************************************************
+   DllData file -- generated by MIDL compiler 
+
+        DO NOT ALTER THIS FILE
+
+   This file is regenerated by MIDL on every IDL file compile.
+
+   To completely reconstruct this file, delete it and rerun MIDL
+   on all the IDL files in this DLL, specifying this file for the
+   /dlldata command line option
+
+*********************************************************/
+
+#define PROXY_DELEGATION
+
+#include <rpcproxy.h>
+
+#ifdef __cplusplus
+extern "C"   {
+#endif
+
+EXTERN_PROXY_FILE( MultiFace )
+
+
+PROXYFILE_LIST_START
+/* Start of list */
+  REFERENCE_PROXY_FILE( MultiFace ),
+/* End of list */
+PROXYFILE_LIST_END
+
+
+DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
+
+#ifdef __cplusplus
+}  /*extern "C" */
+#endif
+
+/* end of generated dlldata file */
diff --git a/samples/com/jacob/samples/test/atl/MultiFace/resource.h b/unittest/com/jacob/test/atl/MultiFace/resource.h
similarity index 100%
rename from samples/com/jacob/samples/test/atl/MultiFace/resource.h
rename to unittest/com/jacob/test/atl/MultiFace/resource.h
diff --git a/samples/com/jacob/samples/test/atl/MultiFaceTest.java b/unittest/com/jacob/test/atl/MultiFaceTest.java
similarity index 97%
rename from samples/com/jacob/samples/test/atl/MultiFaceTest.java
rename to unittest/com/jacob/test/atl/MultiFaceTest.java
index 534d21e..6908ff7 100644
--- a/samples/com/jacob/samples/test/atl/MultiFaceTest.java
+++ b/unittest/com/jacob/test/atl/MultiFaceTest.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test.atl;
+package com.jacob.test.atl;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/atl/readme.txt b/unittest/com/jacob/test/atl/readme.txt
similarity index 100%
rename from samples/com/jacob/samples/test/atl/readme.txt
rename to unittest/com/jacob/test/atl/readme.txt
diff --git a/unittest/com/jacob/com/ExcelEventTest.java b/unittest/com/jacob/test/events/ExcelEventTest.java
similarity index 94%
rename from unittest/com/jacob/com/ExcelEventTest.java
rename to unittest/com/jacob/test/events/ExcelEventTest.java
index 85b0907..749fa0e 100644
--- a/unittest/com/jacob/com/ExcelEventTest.java
+++ b/unittest/com/jacob/test/events/ExcelEventTest.java
@@ -1,7 +1,11 @@
-package com.jacob.com;
+package com.jacob.test.events;
 
 import com.jacob.activeX.ActiveXComponent;
+import com.jacob.com.ComException;
+import com.jacob.com.Dispatch;
 import com.jacob.com.DispatchEvents;
+import com.jacob.com.InvocationProxy;
+import com.jacob.com.Variant;
 
 /**
  * This test was lifted from a forum posting and shows how you can't listen to
diff --git a/samples/com/jacob/samples/test/IETest.java b/unittest/com/jacob/test/events/IETest.java
similarity index 95%
rename from samples/com/jacob/samples/test/IETest.java
rename to unittest/com/jacob/test/events/IETest.java
index 105e7c6..7867138 100644
--- a/samples/com/jacob/samples/test/IETest.java
+++ b/unittest/com/jacob/test/events/IETest.java
@@ -1,8 +1,10 @@
-package com.jacob.samples.test;
+package com.jacob.test.events;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
 /**
+ * It looks like this test is broken again on the cleanup
+ * 
  * This demonstrates the new event handling code in jacob 1.7
  * This example will open up IE and print out some of the events
  * it listens to as it havigates to web sites.
@@ -48,7 +50,8 @@ class IETestThread extends Thread
     
     public void run()
     {
-    	int delay = 5000; // msec
+    	// this used to be 5 seconds but sourceforge is slow
+    	int delay = 10000; // msec
         // paired with statement below that blows up
         ComThread.InitMTA();
         ActiveXComponent ie = new ActiveXComponent("InternetExplorer.Application");
@@ -63,7 +66,7 @@ class IETestThread extends Thread
           Variant optional = new Variant();
           optional.noParam();
     
-          Dispatch.call(ie, "Navigate", new Variant("http://www.danadler.com/jacob"));
+          Dispatch.call(ie, "Navigate", new Variant("http://sourceforge.net/projects/jacob-project"));
           try { Thread.sleep(delay); } catch (Exception e) {}
           Dispatch.call(ie, "Navigate", new Variant("http://groups.yahoo.com/group/jacob-project"));
           try { Thread.sleep(delay); } catch (Exception e) {}
diff --git a/unittest/com/jacob/com/WordEventTest.java b/unittest/com/jacob/test/events/WordEventTest.java
similarity index 78%
rename from unittest/com/jacob/com/WordEventTest.java
rename to unittest/com/jacob/test/events/WordEventTest.java
index 4d07ed7..b66d75e 100644
--- a/unittest/com/jacob/com/WordEventTest.java
+++ b/unittest/com/jacob/test/events/WordEventTest.java
@@ -1,12 +1,17 @@
-package com.jacob.com;
+package com.jacob.test.events;
 
 import com.jacob.activeX.ActiveXComponent;
 import com.jacob.com.ComException;
 import com.jacob.com.DispatchEvents;
+import com.jacob.com.InvocationProxy;
+import com.jacob.com.Variant;
 
 /**
  * This test was lifted from a forum posting and shows how you can't listen to
- * Excel events (added post 1.9.1 Eclipse Settings.)  This also uses the 1.9.1 
+ * Excel events (added post 1.9.1 Eclipse Settings.)
+ * That test was modified make this a MSWord event listener to demonstrate
+ * that the InvocationProxy code works with MS Word Events   
+ * This also uses the 1.10
  * InvocationProxy to receive the events.
  * <p> supported command line options with default values are 
  * -Djava.library.path=d:/jacob/release -Dcom.jacob.autogc=false
@@ -15,7 +20,7 @@ import com.jacob.com.DispatchEvents;
 public class WordEventTest extends InvocationProxy {
 
 	/**
-	 * load up excel, register for events and make stuff happen
+	 * load up word, register for events and make stuff happen
 	 * @param args
 	 */
 	public static void main(String args[]) {
@@ -57,6 +62,10 @@ public class WordEventTest extends InvocationProxy {
 					+ cfe.getMessage());
 
 		}
+		System.out.println(
+				"Someone needs to add some MSWord commands to this to " +
+				"make some on screen stuff happens so the tester " +
+				"thinks we tested something");
 	}
 
 	/**
diff --git a/samples/com/jacob/samples/test/powerpoint/PowerpointTest.java b/unittest/com/jacob/test/powerpoint/PowerpointTest.java
similarity index 90%
rename from samples/com/jacob/samples/test/powerpoint/PowerpointTest.java
rename to unittest/com/jacob/test/powerpoint/PowerpointTest.java
index ad775e1..d90c657 100644
--- a/samples/com/jacob/samples/test/powerpoint/PowerpointTest.java
+++ b/unittest/com/jacob/test/powerpoint/PowerpointTest.java
@@ -1,7 +1,12 @@
-package com.jacob.samples.test.powerpoint;
+package com.jacob.test.powerpoint;
 
- /* 
-  * $Id: PowerpointTest.java,v 1.2 2005/07/07 01:19:06 clay_shooter Exp $ 
+ /** 
+  * $Id$ 
+  * 
+  * This is really more of a multi threaded tester 
+  * 
+  * run with
+  * -Djava.library.path=d:/jacob/release -Dcom.jacob.autogc=false -Dcom.jacob.debug=false
   */ 
 import com.jacob.activeX.ActiveXComponent;
 import com.jacob.com.ComThread;
@@ -19,7 +24,7 @@ public class PowerpointTest extends Thread {
     protected static final int NUM_ITERATIONS = 50;    
           
     private static String POWERPOINT_TEST_PATH = 
-        "D:\\jacob\\samples\\com\\jacob\\samples\\test\\powerpoint\\test";
+        "D:\\jacob\\samples\\com\\jacob\\test\\powerpoint";
         //"c:\\PowerpointTest\test"; 
 
     private int threadID;
@@ -44,7 +49,7 @@ public class PowerpointTest extends Thread {
                 Dispatch comPresentations = Dispatch.get(comPowerpoint,"Presentations").toDispatch();
                 Dispatch comPresentation = Dispatch.call(comPresentations, 
     					"Open",
-    					POWERPOINT_TEST_PATH+threadID+".ppt",
+    					POWERPOINT_TEST_PATH+"\\test"+threadID+".ppt",
     					new Integer(0), 
     					new Integer(0), 
     					new Integer(0)).toDispatch();
diff --git a/samples/com/jacob/samples/test/powerpoint/test1.ppt b/unittest/com/jacob/test/powerpoint/test1.ppt
similarity index 100%
rename from samples/com/jacob/samples/test/powerpoint/test1.ppt
rename to unittest/com/jacob/test/powerpoint/test1.ppt
diff --git a/samples/com/jacob/samples/test/powerpoint/test2.ppt b/unittest/com/jacob/test/powerpoint/test2.ppt
similarity index 100%
rename from samples/com/jacob/samples/test/powerpoint/test2.ppt
rename to unittest/com/jacob/test/powerpoint/test2.ppt
diff --git a/samples/com/jacob/samples/test/powerpoint/test3.ppt b/unittest/com/jacob/test/powerpoint/test3.ppt
similarity index 100%
rename from samples/com/jacob/samples/test/powerpoint/test3.ppt
rename to unittest/com/jacob/test/powerpoint/test3.ppt
diff --git a/samples/com/jacob/samples/test/powerpoint/test4.ppt b/unittest/com/jacob/test/powerpoint/test4.ppt
similarity index 100%
rename from samples/com/jacob/samples/test/powerpoint/test4.ppt
rename to unittest/com/jacob/test/powerpoint/test4.ppt
diff --git a/samples/com/jacob/samples/test/powerpoint/test5.ppt b/unittest/com/jacob/test/powerpoint/test5.ppt
similarity index 100%
rename from samples/com/jacob/samples/test/powerpoint/test5.ppt
rename to unittest/com/jacob/test/powerpoint/test5.ppt
diff --git a/samples/com/jacob/samples/test/test.java b/unittest/com/jacob/test/safearray/SafeArrayContents.java
similarity index 99%
rename from samples/com/jacob/samples/test/test.java
rename to unittest/com/jacob/test/safearray/SafeArrayContents.java
index 88e3155..9de2ca7 100644
--- a/samples/com/jacob/samples/test/test.java
+++ b/unittest/com/jacob/test/safearray/SafeArrayContents.java
@@ -1,8 +1,8 @@
-package com.jacob.samples.test;
+package com.jacob.test.safearray;
 
 import com.jacob.com.*;
 
-class test 
+class SafeArrayContents 
 {
 
  public static void printArray(boolean a[])
diff --git a/unittest/com/jacob/com/SafeArrayReleaseTest.java b/unittest/com/jacob/test/safearray/SafeArrayReleaseTest.java
similarity index 96%
rename from unittest/com/jacob/com/SafeArrayReleaseTest.java
rename to unittest/com/jacob/test/safearray/SafeArrayReleaseTest.java
index 5417c34..a48bf48 100644
--- a/unittest/com/jacob/com/SafeArrayReleaseTest.java
+++ b/unittest/com/jacob/test/safearray/SafeArrayReleaseTest.java
@@ -1,4 +1,8 @@
-package com.jacob.com;
+package com.jacob.test.safearray;
+
+import com.jacob.com.ComThread;
+import com.jacob.com.SafeArray;
+import com.jacob.com.Variant;
 
 /**
  * run with -Djava.library.path=d:/jacob/release -Dcom.jacob.autogc=false -Dcom.jacob.debug=false
diff --git a/samples/com/jacob/samples/test/SafeArrayViaExcel.java b/unittest/com/jacob/test/safearray/SafeArrayViaExcel.java
similarity index 98%
rename from samples/com/jacob/samples/test/SafeArrayViaExcel.java
rename to unittest/com/jacob/test/safearray/SafeArrayViaExcel.java
index d80922a..30f9ee2 100644
--- a/samples/com/jacob/samples/test/SafeArrayViaExcel.java
+++ b/unittest/com/jacob/test/safearray/SafeArrayViaExcel.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.safearray;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/SafeArrayViaExcel.xls b/unittest/com/jacob/test/safearray/SafeArrayViaExcel.xls
similarity index 100%
rename from samples/com/jacob/samples/test/SafeArrayViaExcel.xls
rename to unittest/com/jacob/test/safearray/SafeArrayViaExcel.xls
diff --git a/samples/com/jacob/samples/test/sa_dispatch.java b/unittest/com/jacob/test/safearray/sa_dispatch.java
similarity index 96%
rename from samples/com/jacob/samples/test/sa_dispatch.java
rename to unittest/com/jacob/test/safearray/sa_dispatch.java
index c70713b..9c4caab 100644
--- a/samples/com/jacob/samples/test/sa_dispatch.java
+++ b/unittest/com/jacob/test/safearray/sa_dispatch.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.safearray;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/sa_test.java b/unittest/com/jacob/test/safearray/sa_test.java
similarity index 98%
rename from samples/com/jacob/samples/test/sa_test.java
rename to unittest/com/jacob/test/safearray/sa_test.java
index 5e79e8c..20523af 100644
--- a/samples/com/jacob/samples/test/sa_test.java
+++ b/unittest/com/jacob/test/safearray/sa_test.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.safearray;
 
 import com.jacob.com.*;
 
diff --git a/samples/com/jacob/samples/test/ScriptTest.bat b/unittest/com/jacob/test/vbscript/ScriptTest.bat
similarity index 100%
rename from samples/com/jacob/samples/test/ScriptTest.bat
rename to unittest/com/jacob/test/vbscript/ScriptTest.bat
diff --git a/samples/com/jacob/samples/test/ScriptTest.java b/unittest/com/jacob/test/vbscript/ScriptTest.java
similarity index 97%
rename from samples/com/jacob/samples/test/ScriptTest.java
rename to unittest/com/jacob/test/vbscript/ScriptTest.java
index 2d20eb9..b70039c 100644
--- a/samples/com/jacob/samples/test/ScriptTest.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTest.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTest2.java b/unittest/com/jacob/test/vbscript/ScriptTest2.java
similarity index 98%
rename from samples/com/jacob/samples/test/ScriptTest2.java
rename to unittest/com/jacob/test/vbscript/ScriptTest2.java
index 90d269f..2add06e 100644
--- a/samples/com/jacob/samples/test/ScriptTest2.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTest2.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTest2ActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java
similarity index 98%
rename from samples/com/jacob/samples/test/ScriptTest2ActiveX.java
rename to unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java
index 852280b..08b38fa 100644
--- a/samples/com/jacob/samples/test/ScriptTest2ActiveX.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTest3.java b/unittest/com/jacob/test/vbscript/ScriptTest3.java
similarity index 98%
rename from samples/com/jacob/samples/test/ScriptTest3.java
rename to unittest/com/jacob/test/vbscript/ScriptTest3.java
index bb19857..77f8a16 100644
--- a/samples/com/jacob/samples/test/ScriptTest3.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTest3.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTest3ActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java
similarity index 98%
rename from samples/com/jacob/samples/test/ScriptTest3ActiveX.java
rename to unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java
index fd017c3..7578ddf 100644
--- a/samples/com/jacob/samples/test/ScriptTest3ActiveX.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTestActiveX.java b/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java
similarity index 97%
rename from samples/com/jacob/samples/test/ScriptTestActiveX.java
rename to unittest/com/jacob/test/vbscript/ScriptTestActiveX.java
index c32b0af..0d94b56 100644
--- a/samples/com/jacob/samples/test/ScriptTestActiveX.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/samples/com/jacob/samples/test/ScriptTestErrEvents.java b/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java
similarity index 91%
rename from samples/com/jacob/samples/test/ScriptTestErrEvents.java
rename to unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java
index 536ede0..1133fe1 100644
--- a/samples/com/jacob/samples/test/ScriptTestErrEvents.java
+++ b/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java
@@ -1,5 +1,5 @@
 
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.Variant;
 
diff --git a/samples/com/jacob/samples/test/speed.java b/unittest/com/jacob/test/vbscript/speed.java
similarity index 92%
rename from samples/com/jacob/samples/test/speed.java
rename to unittest/com/jacob/test/vbscript/speed.java
index 17cebe6..778da05 100644
--- a/samples/com/jacob/samples/test/speed.java
+++ b/unittest/com/jacob/test/vbscript/speed.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.test.vbscript;
 
 import com.jacob.com.*;
 import com.jacob.activeX.*;
diff --git a/unittest/com/jacob/test/windowsmedia/WMPlayer.java b/unittest/com/jacob/test/windowsmedia/WMPlayer.java
new file mode 100644
index 0000000..00dc9a3
--- /dev/null
+++ b/unittest/com/jacob/test/windowsmedia/WMPlayer.java
@@ -0,0 +1,28 @@
+package com.jacob.test.windowsmedia;
+
+/**
+ * partial test program from the sourceforge bug report 1453161
+ * that says you get a  random "can't map name to dispid" when
+ * getting the URL from the player
+ * 
+ * I run with options
+ * -Djava.library.path=d:/jacob/release -Dcom.jacob.autogc=false -Dcom.jacob.debug=true
+ */
+import com.jacob.activeX.*;
+
+public class WMPlayer {
+
+    public static void main(String[] args){
+		ActiveXComponent wmp = null;
+		wmp = new ActiveXComponent("WMPlayer.OCX");
+		
+		// the sourceforge posting didn't post all the code so this is all we have
+		// we need some other information on how to set the document
+		// so that we have a url to open
+		for ( int i= 0 ; i < 1000 ; i++){
+		System.out.println("the wmp url is "+ wmp.getProperty("URL").toString());
+		}
+    		
+    }
+    
+}
diff --git a/unittest/readme.txt b/unittest/readme.txt
index f0f8f31..389dc05 100644
--- a/unittest/readme.txt
+++ b/unittest/readme.txt
@@ -1 +1,3 @@
-This directory will eventually contain the junit automated tests.
\ No newline at end of file
+This directory contains junit tests and other/older tests for
+specific functions.  Sometimes tests in this directory migrate
+to the samples directory as they are updated to show more functionality.
\ No newline at end of file