diff --git a/jni/ComThread.cpp b/src/main/cpp/ComThread.cpp
similarity index 100%
rename from jni/ComThread.cpp
rename to src/main/cpp/ComThread.cpp
diff --git a/jni/Dispatch.cpp b/src/main/cpp/Dispatch.cpp
similarity index 100%
rename from jni/Dispatch.cpp
rename to src/main/cpp/Dispatch.cpp
diff --git a/jni/DispatchEvents.cpp b/src/main/cpp/DispatchEvents.cpp
similarity index 100%
rename from jni/DispatchEvents.cpp
rename to src/main/cpp/DispatchEvents.cpp
diff --git a/jni/DispatchProxy.cpp b/src/main/cpp/DispatchProxy.cpp
similarity index 100%
rename from jni/DispatchProxy.cpp
rename to src/main/cpp/DispatchProxy.cpp
diff --git a/jni/EnumVariant.cpp b/src/main/cpp/EnumVariant.cpp
similarity index 100%
rename from jni/EnumVariant.cpp
rename to src/main/cpp/EnumVariant.cpp
diff --git a/jni/EventProxy.cpp b/src/main/cpp/EventProxy.cpp
similarity index 100%
rename from jni/EventProxy.cpp
rename to src/main/cpp/EventProxy.cpp
diff --git a/jni/STA.cpp b/src/main/cpp/STA.cpp
similarity index 100%
rename from jni/STA.cpp
rename to src/main/cpp/STA.cpp
diff --git a/jni/SafeArray.cpp b/src/main/cpp/SafeArray.cpp
similarity index 100%
rename from jni/SafeArray.cpp
rename to src/main/cpp/SafeArray.cpp
diff --git a/jni/Variant.cpp b/src/main/cpp/Variant.cpp
similarity index 100%
rename from jni/Variant.cpp
rename to src/main/cpp/Variant.cpp
diff --git a/jni/util.cpp b/src/main/cpp/util.cpp
similarity index 100%
rename from jni/util.cpp
rename to src/main/cpp/util.cpp
diff --git a/jni/ComThread.h b/src/main/headers/ComThread.h
similarity index 100%
rename from jni/ComThread.h
rename to src/main/headers/ComThread.h
diff --git a/jni/Dispatch.h b/src/main/headers/Dispatch.h
similarity index 100%
rename from jni/Dispatch.h
rename to src/main/headers/Dispatch.h
diff --git a/jni/DispatchEvents.h b/src/main/headers/DispatchEvents.h
similarity index 100%
rename from jni/DispatchEvents.h
rename to src/main/headers/DispatchEvents.h
diff --git a/jni/DispatchProxy.h b/src/main/headers/DispatchProxy.h
similarity index 100%
rename from jni/DispatchProxy.h
rename to src/main/headers/DispatchProxy.h
diff --git a/jni/EnumVariant.h b/src/main/headers/EnumVariant.h
similarity index 100%
rename from jni/EnumVariant.h
rename to src/main/headers/EnumVariant.h
diff --git a/jni/EventProxy.h b/src/main/headers/EventProxy.h
similarity index 100%
rename from jni/EventProxy.h
rename to src/main/headers/EventProxy.h
diff --git a/jni/STA.h b/src/main/headers/STA.h
similarity index 100%
rename from jni/STA.h
rename to src/main/headers/STA.h
diff --git a/jni/SafeArray.h b/src/main/headers/SafeArray.h
similarity index 100%
rename from jni/SafeArray.h
rename to src/main/headers/SafeArray.h
diff --git a/jni/StdAfx.h b/src/main/headers/StdAfx.h
similarity index 100%
rename from jni/StdAfx.h
rename to src/main/headers/StdAfx.h
diff --git a/jni/Variant.h b/src/main/headers/Variant.h
similarity index 100%
rename from jni/Variant.h
rename to src/main/headers/Variant.h
diff --git a/jni/util.h b/src/main/headers/util.h
similarity index 100%
rename from jni/util.h
rename to src/main/headers/util.h
diff --git a/src/com/jacob/activeX/.cvsignore b/src/main/java/com/jacob/activeX/.cvsignore
similarity index 100%
rename from src/com/jacob/activeX/.cvsignore
rename to src/main/java/com/jacob/activeX/.cvsignore
diff --git a/src/com/jacob/activeX/ActiveXComponent.java b/src/main/java/com/jacob/activeX/ActiveXComponent.java
similarity index 100%
rename from src/com/jacob/activeX/ActiveXComponent.java
rename to src/main/java/com/jacob/activeX/ActiveXComponent.java
diff --git a/src/com/jacob/activeX/ActiveXDispatchEvents.java b/src/main/java/com/jacob/activeX/ActiveXDispatchEvents.java
similarity index 100%
rename from src/com/jacob/activeX/ActiveXDispatchEvents.java
rename to src/main/java/com/jacob/activeX/ActiveXDispatchEvents.java
diff --git a/src/com/jacob/activeX/ActiveXInvocationProxy.java b/src/main/java/com/jacob/activeX/ActiveXInvocationProxy.java
similarity index 100%
rename from src/com/jacob/activeX/ActiveXInvocationProxy.java
rename to src/main/java/com/jacob/activeX/ActiveXInvocationProxy.java
diff --git a/src/com/jacob/com/.cvsignore b/src/main/java/com/jacob/com/.cvsignore
similarity index 100%
rename from src/com/jacob/com/.cvsignore
rename to src/main/java/com/jacob/com/.cvsignore
diff --git a/src/com/jacob/com/ComException.java b/src/main/java/com/jacob/com/ComException.java
similarity index 100%
rename from src/com/jacob/com/ComException.java
rename to src/main/java/com/jacob/com/ComException.java
diff --git a/src/com/jacob/com/ComFailException.java b/src/main/java/com/jacob/com/ComFailException.java
similarity index 100%
rename from src/com/jacob/com/ComFailException.java
rename to src/main/java/com/jacob/com/ComFailException.java
diff --git a/src/com/jacob/com/ComThread.java b/src/main/java/com/jacob/com/ComThread.java
similarity index 100%
rename from src/com/jacob/com/ComThread.java
rename to src/main/java/com/jacob/com/ComThread.java
diff --git a/src/com/jacob/com/Currency.java b/src/main/java/com/jacob/com/Currency.java
similarity index 100%
rename from src/com/jacob/com/Currency.java
rename to src/main/java/com/jacob/com/Currency.java
diff --git a/src/com/jacob/com/DateUtilities.java b/src/main/java/com/jacob/com/DateUtilities.java
similarity index 100%
rename from src/com/jacob/com/DateUtilities.java
rename to src/main/java/com/jacob/com/DateUtilities.java
diff --git a/src/com/jacob/com/Dispatch.java b/src/main/java/com/jacob/com/Dispatch.java
similarity index 100%
rename from src/com/jacob/com/Dispatch.java
rename to src/main/java/com/jacob/com/Dispatch.java
diff --git a/src/com/jacob/com/DispatchEvents.java b/src/main/java/com/jacob/com/DispatchEvents.java
similarity index 100%
rename from src/com/jacob/com/DispatchEvents.java
rename to src/main/java/com/jacob/com/DispatchEvents.java
diff --git a/src/com/jacob/com/DispatchIdentifier.java b/src/main/java/com/jacob/com/DispatchIdentifier.java
similarity index 100%
rename from src/com/jacob/com/DispatchIdentifier.java
rename to src/main/java/com/jacob/com/DispatchIdentifier.java
diff --git a/src/com/jacob/com/DispatchProxy.java b/src/main/java/com/jacob/com/DispatchProxy.java
similarity index 100%
rename from src/com/jacob/com/DispatchProxy.java
rename to src/main/java/com/jacob/com/DispatchProxy.java
diff --git a/src/com/jacob/com/EnumVariant.java b/src/main/java/com/jacob/com/EnumVariant.java
similarity index 100%
rename from src/com/jacob/com/EnumVariant.java
rename to src/main/java/com/jacob/com/EnumVariant.java
diff --git a/src/com/jacob/com/InvocationProxy.java b/src/main/java/com/jacob/com/InvocationProxy.java
similarity index 100%
rename from src/com/jacob/com/InvocationProxy.java
rename to src/main/java/com/jacob/com/InvocationProxy.java
diff --git a/src/com/jacob/com/InvocationProxyAllVariants.java b/src/main/java/com/jacob/com/InvocationProxyAllVariants.java
similarity index 100%
rename from src/com/jacob/com/InvocationProxyAllVariants.java
rename to src/main/java/com/jacob/com/InvocationProxyAllVariants.java
diff --git a/src/com/jacob/com/JacobException.java b/src/main/java/com/jacob/com/JacobException.java
similarity index 100%
rename from src/com/jacob/com/JacobException.java
rename to src/main/java/com/jacob/com/JacobException.java
diff --git a/src/com/jacob/com/JacobObject.java b/src/main/java/com/jacob/com/JacobObject.java
similarity index 100%
rename from src/com/jacob/com/JacobObject.java
rename to src/main/java/com/jacob/com/JacobObject.java
diff --git a/src/com/jacob/com/JacobReleaseInfo.java b/src/main/java/com/jacob/com/JacobReleaseInfo.java
similarity index 100%
rename from src/com/jacob/com/JacobReleaseInfo.java
rename to src/main/java/com/jacob/com/JacobReleaseInfo.java
diff --git a/src/com/jacob/com/LibraryLoader.java b/src/main/java/com/jacob/com/LibraryLoader.java
similarity index 100%
rename from src/com/jacob/com/LibraryLoader.java
rename to src/main/java/com/jacob/com/LibraryLoader.java
diff --git a/src/com/jacob/com/MainSTA.java b/src/main/java/com/jacob/com/MainSTA.java
similarity index 100%
rename from src/com/jacob/com/MainSTA.java
rename to src/main/java/com/jacob/com/MainSTA.java
diff --git a/src/com/jacob/com/NotImplementedException.java b/src/main/java/com/jacob/com/NotImplementedException.java
similarity index 100%
rename from src/com/jacob/com/NotImplementedException.java
rename to src/main/java/com/jacob/com/NotImplementedException.java
diff --git a/src/com/jacob/com/ROT.java b/src/main/java/com/jacob/com/ROT.java
similarity index 100%
rename from src/com/jacob/com/ROT.java
rename to src/main/java/com/jacob/com/ROT.java
diff --git a/src/com/jacob/com/STA.java b/src/main/java/com/jacob/com/STA.java
similarity index 100%
rename from src/com/jacob/com/STA.java
rename to src/main/java/com/jacob/com/STA.java
diff --git a/src/com/jacob/com/SafeArray.java b/src/main/java/com/jacob/com/SafeArray.java
similarity index 100%
rename from src/com/jacob/com/SafeArray.java
rename to src/main/java/com/jacob/com/SafeArray.java
diff --git a/src/com/jacob/com/Variant.java b/src/main/java/com/jacob/com/Variant.java
similarity index 100%
rename from src/com/jacob/com/Variant.java
rename to src/main/java/com/jacob/com/Variant.java
diff --git a/src/com/jacob/com/VariantUtilities.java b/src/main/java/com/jacob/com/VariantUtilities.java
similarity index 100%
rename from src/com/jacob/com/VariantUtilities.java
rename to src/main/java/com/jacob/com/VariantUtilities.java
diff --git a/src/com/jacob/com/VariantViaEvent.java b/src/main/java/com/jacob/com/VariantViaEvent.java
similarity index 100%
rename from src/com/jacob/com/VariantViaEvent.java
rename to src/main/java/com/jacob/com/VariantViaEvent.java
diff --git a/src/com/jacob/com/WrongThreadException.java b/src/main/java/com/jacob/com/WrongThreadException.java
similarity index 100%
rename from src/com/jacob/com/WrongThreadException.java
rename to src/main/java/com/jacob/com/WrongThreadException.java
diff --git a/unittest/com/jacob/com/ActiveXComponentFactoryTest.java b/src/test/java/com/jacob/com/ActiveXComponentFactoryTest.java
similarity index 100%
rename from unittest/com/jacob/com/ActiveXComponentFactoryTest.java
rename to src/test/java/com/jacob/com/ActiveXComponentFactoryTest.java
diff --git a/unittest/com/jacob/com/DateUtilitiesTest.java b/src/test/java/com/jacob/com/DateUtilitiesTest.java
similarity index 100%
rename from unittest/com/jacob/com/DateUtilitiesTest.java
rename to src/test/java/com/jacob/com/DateUtilitiesTest.java
diff --git a/unittest/com/jacob/com/DispatchNullProgramId.java b/src/test/java/com/jacob/com/DispatchNullProgramId.java
similarity index 100%
rename from unittest/com/jacob/com/DispatchNullProgramId.java
rename to src/test/java/com/jacob/com/DispatchNullProgramId.java
diff --git a/unittest/com/jacob/com/DispatchTest.java b/src/test/java/com/jacob/com/DispatchTest.java
similarity index 100%
rename from unittest/com/jacob/com/DispatchTest.java
rename to src/test/java/com/jacob/com/DispatchTest.java
diff --git a/unittest/com/jacob/com/DispatchValidDispatchTest.java b/src/test/java/com/jacob/com/DispatchValidDispatchTest.java
similarity index 100%
rename from unittest/com/jacob/com/DispatchValidDispatchTest.java
rename to src/test/java/com/jacob/com/DispatchValidDispatchTest.java
diff --git a/unittest/com/jacob/com/JacobDeadlockTest.java b/src/test/java/com/jacob/com/JacobDeadlockTest.java
similarity index 100%
rename from unittest/com/jacob/com/JacobDeadlockTest.java
rename to src/test/java/com/jacob/com/JacobDeadlockTest.java
diff --git a/unittest/com/jacob/com/JacobObjectTest.java b/src/test/java/com/jacob/com/JacobObjectTest.java
similarity index 100%
rename from unittest/com/jacob/com/JacobObjectTest.java
rename to src/test/java/com/jacob/com/JacobObjectTest.java
diff --git a/unittest/com/jacob/com/LibraryLoaderTest.java b/src/test/java/com/jacob/com/LibraryLoaderTest.java
similarity index 100%
rename from unittest/com/jacob/com/LibraryLoaderTest.java
rename to src/test/java/com/jacob/com/LibraryLoaderTest.java
diff --git a/unittest/com/jacob/com/README.txt b/src/test/java/com/jacob/com/README.txt
similarity index 100%
rename from unittest/com/jacob/com/README.txt
rename to src/test/java/com/jacob/com/README.txt
diff --git a/unittest/com/jacob/com/ROT2Test.java b/src/test/java/com/jacob/com/ROT2Test.java
similarity index 100%
rename from unittest/com/jacob/com/ROT2Test.java
rename to src/test/java/com/jacob/com/ROT2Test.java
diff --git a/unittest/com/jacob/com/ROT3Test.java b/src/test/java/com/jacob/com/ROT3Test.java
similarity index 100%
rename from unittest/com/jacob/com/ROT3Test.java
rename to src/test/java/com/jacob/com/ROT3Test.java
diff --git a/unittest/com/jacob/com/ROTTest.java b/src/test/java/com/jacob/com/ROTTest.java
similarity index 100%
rename from unittest/com/jacob/com/ROTTest.java
rename to src/test/java/com/jacob/com/ROTTest.java
diff --git a/unittest/com/jacob/com/VariantDateTest.java b/src/test/java/com/jacob/com/VariantDateTest.java
similarity index 100%
rename from unittest/com/jacob/com/VariantDateTest.java
rename to src/test/java/com/jacob/com/VariantDateTest.java
diff --git a/unittest/com/jacob/com/VariantTest.java b/src/test/java/com/jacob/com/VariantTest.java
similarity index 100%
rename from unittest/com/jacob/com/VariantTest.java
rename to src/test/java/com/jacob/com/VariantTest.java
diff --git a/unittest/com/jacob/com/VariantUtilitiesTest.java b/src/test/java/com/jacob/com/VariantUtilitiesTest.java
similarity index 100%
rename from unittest/com/jacob/com/VariantUtilitiesTest.java
rename to src/test/java/com/jacob/com/VariantUtilitiesTest.java
diff --git a/unittest/com/jacob/test/BaseTestCase.java b/src/test/java/com/jacob/test/BaseTestCase.java
similarity index 100%
rename from unittest/com/jacob/test/BaseTestCase.java
rename to src/test/java/com/jacob/test/BaseTestCase.java
diff --git a/unittest/com/jacob/test/errors/UnicodeErrorTest.java b/src/test/java/com/jacob/test/errors/UnicodeErrorTest.java
similarity index 100%
rename from unittest/com/jacob/test/errors/UnicodeErrorTest.java
rename to src/test/java/com/jacob/test/errors/UnicodeErrorTest.java
diff --git a/unittest/com/jacob/test/events/ExcelEventTest.java b/src/test/java/com/jacob/test/events/ExcelEventTest.java
similarity index 100%
rename from unittest/com/jacob/test/events/ExcelEventTest.java
rename to src/test/java/com/jacob/test/events/ExcelEventTest.java
diff --git a/unittest/com/jacob/test/events/IETest.java b/src/test/java/com/jacob/test/events/IETest.java
similarity index 100%
rename from unittest/com/jacob/test/events/IETest.java
rename to src/test/java/com/jacob/test/events/IETest.java
diff --git a/unittest/com/jacob/test/events/IETestActiveXProxy.java b/src/test/java/com/jacob/test/events/IETestActiveXProxy.java
similarity index 100%
rename from unittest/com/jacob/test/events/IETestActiveXProxy.java
rename to src/test/java/com/jacob/test/events/IETestActiveXProxy.java
diff --git a/unittest/com/jacob/test/events/WordEventTest.java b/src/test/java/com/jacob/test/events/WordEventTest.java
similarity index 100%
rename from unittest/com/jacob/test/events/WordEventTest.java
rename to src/test/java/com/jacob/test/events/WordEventTest.java
diff --git a/unittest/com/jacob/test/excel/ControllerTest.java b/src/test/java/com/jacob/test/excel/ControllerTest.java
similarity index 100%
rename from unittest/com/jacob/test/excel/ControllerTest.java
rename to src/test/java/com/jacob/test/excel/ControllerTest.java
diff --git a/unittest/com/jacob/test/excel/teste.xls b/src/test/java/com/jacob/test/excel/teste.xls
similarity index 100%
rename from unittest/com/jacob/test/excel/teste.xls
rename to src/test/java/com/jacob/test/excel/teste.xls
diff --git a/unittest/com/jacob/test/powerpoint/PowerpointTest.java b/src/test/java/com/jacob/test/powerpoint/PowerpointTest.java
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/PowerpointTest.java
rename to src/test/java/com/jacob/test/powerpoint/PowerpointTest.java
diff --git a/unittest/com/jacob/test/powerpoint/test1.ppt b/src/test/java/com/jacob/test/powerpoint/test1.ppt
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/test1.ppt
rename to src/test/java/com/jacob/test/powerpoint/test1.ppt
diff --git a/unittest/com/jacob/test/powerpoint/test2.ppt b/src/test/java/com/jacob/test/powerpoint/test2.ppt
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/test2.ppt
rename to src/test/java/com/jacob/test/powerpoint/test2.ppt
diff --git a/unittest/com/jacob/test/powerpoint/test3.ppt b/src/test/java/com/jacob/test/powerpoint/test3.ppt
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/test3.ppt
rename to src/test/java/com/jacob/test/powerpoint/test3.ppt
diff --git a/unittest/com/jacob/test/powerpoint/test4.ppt b/src/test/java/com/jacob/test/powerpoint/test4.ppt
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/test4.ppt
rename to src/test/java/com/jacob/test/powerpoint/test4.ppt
diff --git a/unittest/com/jacob/test/powerpoint/test5.ppt b/src/test/java/com/jacob/test/powerpoint/test5.ppt
similarity index 100%
rename from unittest/com/jacob/test/powerpoint/test5.ppt
rename to src/test/java/com/jacob/test/powerpoint/test5.ppt
diff --git a/unittest/com/jacob/test/safearray/SafeArrayBasicTest.java b/src/test/java/com/jacob/test/safearray/SafeArrayBasicTest.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayBasicTest.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayBasicTest.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayContents.java b/src/test/java/com/jacob/test/safearray/SafeArrayContents.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayContents.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayContents.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayDispatchTest.java b/src/test/java/com/jacob/test/safearray/SafeArrayDispatchTest.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayDispatchTest.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayDispatchTest.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayLeak.java b/src/test/java/com/jacob/test/safearray/SafeArrayLeak.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayLeak.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayLeak.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayReleaseTest.java b/src/test/java/com/jacob/test/safearray/SafeArrayReleaseTest.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayReleaseTest.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayReleaseTest.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayStringConstructorTest.java b/src/test/java/com/jacob/test/safearray/SafeArrayStringConstructorTest.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayStringConstructorTest.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayStringConstructorTest.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayViaExcel.java b/src/test/java/com/jacob/test/safearray/SafeArrayViaExcel.java
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayViaExcel.java
rename to src/test/java/com/jacob/test/safearray/SafeArrayViaExcel.java
diff --git a/unittest/com/jacob/test/safearray/SafeArrayViaExcel.xls b/src/test/java/com/jacob/test/safearray/SafeArrayViaExcel.xls
similarity index 100%
rename from unittest/com/jacob/test/safearray/SafeArrayViaExcel.xls
rename to src/test/java/com/jacob/test/safearray/SafeArrayViaExcel.xls
diff --git a/unittest/com/jacob/test/vbscript/ScriptTest.java b/src/test/java/com/jacob/test/vbscript/ScriptTest.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTest.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTest.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTest2.java b/src/test/java/com/jacob/test/vbscript/ScriptTest2.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTest2.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTest2.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java b/src/test/java/com/jacob/test/vbscript/ScriptTest2ActiveX.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTest2ActiveX.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTest2ActiveX.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTest3.java b/src/test/java/com/jacob/test/vbscript/ScriptTest3.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTest3.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTest3.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java b/src/test/java/com/jacob/test/vbscript/ScriptTest3ActiveX.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTest3ActiveX.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTest3ActiveX.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTestActiveX.java b/src/test/java/com/jacob/test/vbscript/ScriptTestActiveX.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTestActiveX.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTestActiveX.java
diff --git a/unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java b/src/test/java/com/jacob/test/vbscript/ScriptTestErrEvents.java
similarity index 100%
rename from unittest/com/jacob/test/vbscript/ScriptTestErrEvents.java
rename to src/test/java/com/jacob/test/vbscript/ScriptTestErrEvents.java
diff --git a/unittest/com/jacob/test/windowsmedia/WMPlayer.java b/src/test/java/com/jacob/test/windowsmedia/WMPlayer.java
similarity index 100%
rename from unittest/com/jacob/test/windowsmedia/WMPlayer.java
rename to src/test/java/com/jacob/test/windowsmedia/WMPlayer.java