diff --git a/samples/com/jacob/samples/test/math.java b/samples/com/jacob/samples/test/MathProj/MathTest.java
similarity index 85%
rename from samples/com/jacob/samples/test/math.java
rename to samples/com/jacob/samples/test/MathProj/MathTest.java
index 37bb0d4..5428915 100644
--- a/samples/com/jacob/samples/test/math.java
+++ b/samples/com/jacob/samples/test/MathProj/MathTest.java
@@ -1,4 +1,4 @@
-package com.jacob.samples.test;
+package com.jacob.samples.test.MathProj;
 
 import com.jacob.activeX.ActiveXComponent;
 import com.jacob.com.*;
@@ -10,12 +10,20 @@ import com.jacob.com.*;
  * -Djava.library.path=d:/jacob/release -Dcom.jacob.autogc=false -Dcom.jacob.debug=true
  * </pre>
  */
-class math {
+class MathTest {
 	public static void main(String[] args) {
+		MathTest me = new MathTest();
+		me.runTest();
+	}
+	
+	public MathTest(){
+	}
+	
+	public void runTest(){
 		// deprecated
 		// System.runFinalizersOnExit(true);
 		Dispatch test = new ActiveXComponent("MathTest.Math");
-		testEvents te = new testEvents();
+		TestEvents te = new TestEvents();
 		DispatchEvents de = new DispatchEvents(test, te);
 		if (de == null) {
 			System.out
@@ -33,9 +41,8 @@ class math {
 		System.out.println("v.isNull=" + v.isNull());
 		System.out.println("v.toDispatch=" + v.toDispatch());
 	}
-}
 
-class testEvents {
+public class TestEvents {
 	public void DoneAdd(Variant[] args) {
 		System.out.println("DoneAdd called in java");
 	}
@@ -44,3 +51,5 @@ class testEvents {
 		System.out.println("DoneMult called in java");
 	}
 }
+
+}
diff --git a/samples/com/jacob/samples/test/MathProj/README b/samples/com/jacob/samples/test/MathProj/README
deleted file mode 100644
index b31c449..0000000
--- a/samples/com/jacob/samples/test/MathProj/README
+++ /dev/null
@@ -1 +0,0 @@
-A Simple VB COM DLL that exposes two methods and raises events.
diff --git a/samples/com/jacob/samples/test/MathProj/README.txt b/samples/com/jacob/samples/test/MathProj/README.txt
new file mode 100644
index 0000000..12e81ce
--- /dev/null
+++ b/samples/com/jacob/samples/test/MathProj/README.txt
@@ -0,0 +1,5 @@
+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