diff --git a/examples/simple/compile.sh b/examples/simple/compile.sh
new file mode 100644
index 0000000000000000000000000000000000000000..d6a9f67c8e4c2c08aefbbd16ac45d4196df174c8
--- /dev/null
+++ b/examples/simple/compile.sh
@@ -0,0 +1 @@
+java -jar ../../labComm.jar --java=java simple.lc
diff --git a/examples/simple/simple.lc b/examples/simple/simple.lc
new file mode 100644
index 0000000000000000000000000000000000000000..b83c63ab174846aced85e9a53a39185b47cb5de5
--- /dev/null
+++ b/examples/simple/simple.lc
@@ -0,0 +1,9 @@
+sample struct {
+  int a;
+  int b;
+} TwoInts;
+
+sample struct {
+  int x;
+  string s;
+} IntString;
diff --git a/wiki_example/data.java b/examples/wiki_example/data.java
similarity index 100%
rename from wiki_example/data.java
rename to examples/wiki_example/data.java
diff --git a/wiki_example/example.c b/examples/wiki_example/example.c
similarity index 100%
rename from wiki_example/example.c
rename to examples/wiki_example/example.c
diff --git a/wiki_example/example.encoded b/examples/wiki_example/example.encoded
similarity index 100%
rename from wiki_example/example.encoded
rename to examples/wiki_example/example.encoded
diff --git a/wiki_example/example.h b/examples/wiki_example/example.h
similarity index 100%
rename from wiki_example/example.h
rename to examples/wiki_example/example.h
diff --git a/wiki_example/example.lc b/examples/wiki_example/example.lc
similarity index 100%
rename from wiki_example/example.lc
rename to examples/wiki_example/example.lc
diff --git a/wiki_example/example.py b/examples/wiki_example/example.py
similarity index 100%
rename from wiki_example/example.py
rename to examples/wiki_example/example.py
diff --git a/wiki_example/example_decoder.py b/examples/wiki_example/example_decoder.py
similarity index 100%
rename from wiki_example/example_decoder.py
rename to examples/wiki_example/example_decoder.py
diff --git a/wiki_example/example_decoder_encoder.java b/examples/wiki_example/example_decoder_encoder.java
similarity index 100%
rename from wiki_example/example_decoder_encoder.java
rename to examples/wiki_example/example_decoder_encoder.java
diff --git a/wiki_example/example_encoder.c b/examples/wiki_example/example_encoder.c
similarity index 100%
rename from wiki_example/example_encoder.c
rename to examples/wiki_example/example_encoder.c
diff --git a/examples/wiki_example/run b/examples/wiki_example/run
new file mode 100755
index 0000000000000000000000000000000000000000..5e0719b8d6b25986e0ce032c481d11abf1f70e73
--- /dev/null
+++ b/examples/wiki_example/run
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Auto generate code from .lc file
+java -jar ../../labComm.jar \
+  --c=example.c --h=example.h \
+  --java=. \
+  --cs=example.cs \
+  --python=example.py \
+  example.lc
+
+# Compile executables
+gcc -o example_encoder -I ../../lib/c/ \
+	example_encoder.c \
+ 	example.c \
+	../../lib/c/labcomm.c \
+	../../lib/c//labcomm_fd_reader_writer.c
+javac -cp ../../lib/java:. *.java
+
+# Run through all executables (c->java->Python)
+./example_encoder one two
+java -cp ../../lib/java:. example_decoder_encoder example.encoded example.javaencoded
+PYTHONPATH=../../lib/python ./example_decoder.py example.javaencoded
diff --git a/wiki_example/run b/wiki_example/run
deleted file mode 100755
index dfe403b355e21969b49a21c506541e6b1140b396..0000000000000000000000000000000000000000
--- a/wiki_example/run
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Auto generate code from .lc file
-java -jar ../labComm.jar \
-  --c=example.c --h=example.h \
-  --java=. \
-  --cs=example.cs \
-  --python=example.py \
-  example.lc
-
-# Compile executables
-gcc -o example_encoder -I ../lib/c/ \
-	example_encoder.c \
- 	example.c \
-	../lib/c/labcomm.c \
-	../lib/c//labcomm_fd_reader_writer.c
-javac -cp ../lib/java:. *.java
-
-# Run through all executables (c->java->Python)
-./example_encoder one two
-java -cp ../lib/java:. example_decoder_encoder example.encoded example.javaencoded
-PYTHONPATH=../lib/python ./example_decoder.py example.javaencoded