diff --git a/j8code/src/j8code/J8Helper.java b/j8code/src/org/springsource/loaded/support/Java8.java
similarity index 100%
rename from j8code/src/j8code/J8Helper.java
rename to j8code/src/org/springsource/loaded/support/Java8.java
diff --git a/testdata-java8/src/main/java/basic/LambdaB.java b/testdata-java8/src/main/java/basic/LambdaB.java
new file mode 100644
index 0000000..1388812
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaB.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaB {
+
+	public interface Foo { long m(int i); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static long run() {
+		Foo f = null;
+		f = (i) -> i*33;
+		return f.m(3);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaB2.java b/testdata-java8/src/main/java/basic/LambdaB2.java
new file mode 100644
index 0000000..ae90e8b
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaB2.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaB2 {
+
+	public interface Foo { long m(int i); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static long run() {
+		Foo f = null;
+		f = (i) -> i*44;
+		return f.m(4);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaC.java b/testdata-java8/src/main/java/basic/LambdaC.java
new file mode 100644
index 0000000..14d415e
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaC.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaC {
+
+	public interface Boo { long m(int i,int j); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static long run() {
+		Boo f = null;
+		f = (i,j) -> i*j;
+		return f.m(3,2);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaC2.java b/testdata-java8/src/main/java/basic/LambdaC2.java
new file mode 100644
index 0000000..c091501
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaC2.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaC2 {
+
+	public interface Boo { long m(int i,int j); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static long run() {
+		Boo f = null;
+		f = (i,j) -> i+j;
+		return f.m(3,2);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaD.java b/testdata-java8/src/main/java/basic/LambdaD.java
new file mode 100644
index 0000000..72451fc
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaD.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaD {
+
+	public interface Boo { String m(int i,String s, int j, boolean b); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+		Boo f = null;
+		f = (i,j,k,l) -> ""+l+i+k+j;
+		return f.m(3,"abc",42,true);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaD2.java b/testdata-java8/src/main/java/basic/LambdaD2.java
new file mode 100644
index 0000000..586a3f4
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaD2.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaD2 {
+
+	public interface Boo { String m(int i,String s, int j, boolean b); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+		Boo f = null;
+		f = (i,j,k,l) -> j+(i*k)+l;
+		return f.m(3,"def",88,true);
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaE.java b/testdata-java8/src/main/java/basic/LambdaE.java
new file mode 100644
index 0000000..47e962a
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaE.java
@@ -0,0 +1,23 @@
+package basic;
+
+public class LambdaE {
+
+	public interface Boo { String m(char s); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+ 		int i = 4;
+		Boo f = null;
+		f = (c) -> { 
+			StringBuilder buf = new StringBuilder();
+  			for (int j=0;j<i;j++) {
+				buf.append(c);
+			}
+			return buf.toString();
+		};
+		return f.m('a');
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaE2.java b/testdata-java8/src/main/java/basic/LambdaE2.java
new file mode 100644
index 0000000..c38c6af
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaE2.java
@@ -0,0 +1,23 @@
+package basic;
+
+public class LambdaE2 {
+
+	public interface Boo { String m(char s); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+ 		int i = 8;
+		Boo f = null;
+		f = (c) -> { 
+			StringBuilder buf = new StringBuilder();
+  			for (int j=0;j<i;j++) {
+				buf.append(c);
+			}
+			return buf.toString();
+		};
+		return f.m('a');
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaF.java b/testdata-java8/src/main/java/basic/LambdaF.java
new file mode 100644
index 0000000..ff16646
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaF.java
@@ -0,0 +1,33 @@
+package basic;
+
+public class LambdaF {
+	
+	public int fieldOne = 7;
+	
+	public String concatenator(char ch, int number) {
+		StringBuilder buf = new StringBuilder();
+			for (int j=0;j<number;j++) {
+			buf.append(ch);
+		}
+		return buf.toString();		
+	}
+
+	public interface Boo { String m(char s); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+		return new LambdaF().x();
+	}
+	
+	public String x() {
+ 		int i = 4;
+		Boo f = null;
+		f = (c) -> { 
+			return concatenator(c,fieldOne);
+		};
+		return f.m('a');
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaF2.java b/testdata-java8/src/main/java/basic/LambdaF2.java
new file mode 100644
index 0000000..9b6cf02
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaF2.java
@@ -0,0 +1,34 @@
+package basic;
+
+public class LambdaF2 {
+	
+	public int fieldOne = 3;
+	
+	public String concatenator(char ch, int number) {
+		StringBuilder buf = new StringBuilder();
+			for (int j=0;j<number;j++) {
+			buf.append(ch);
+			buf.append(':');
+		}
+		return buf.toString();		
+	}
+
+	public interface Boo { String m(char s); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static String run() {
+		return new LambdaF2().x();
+	}
+	
+	public String x() {
+ 		int i = 4;
+		Boo f = null;
+		f = (c) -> { 
+			return concatenator(c,fieldOne);
+		};
+		return f.m('a');
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaG.java b/testdata-java8/src/main/java/basic/LambdaG.java
new file mode 100644
index 0000000..a0885ed
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaG.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaG {
+	
+	interface Boo { int m(); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static int run() {
+		Boo f = null;
+		f = () -> 99;
+		return f.m();
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaG2.java b/testdata-java8/src/main/java/basic/LambdaG2.java
new file mode 100644
index 0000000..4b2b2da
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaG2.java
@@ -0,0 +1,16 @@
+package basic;
+
+public class LambdaG2 {
+	
+	interface Boo { int m(); }
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static int run() {
+		Boo f = null;
+		f = () -> 44;
+		return f.m();
+	}
+}
diff --git a/testdata-java8/src/main/java/basic/LambdaH.java b/testdata-java8/src/main/java/basic/LambdaH.java
new file mode 100644
index 0000000..3c12398
--- /dev/null
+++ b/testdata-java8/src/main/java/basic/LambdaH.java
@@ -0,0 +1,34 @@
+package basic;
+
+public class LambdaH {
+	
+	public interface Foo { int m(); }
+
+	public int fieldOne = 7;
+	
+	public int concatenator(int a, int b) {
+		return a*b;
+	}
+
+	
+	public static void main(String[] args) {
+		run();
+	}
+	
+	public static int run() {
+		int count = 0;
+		count += ((Foo)()->7).m();
+		count += new LambdaH().x();
+		count += ((Foo)()->21).m();
+		return count;
+	}
+	
+	public int x() {
+ 		int i = 4;
+		Foo f = null;
+		f = () -> { 
+			return concatenator(i,fieldOne);
+		};
+		return f.m();
+	}
+}