diff --git a/Makefile b/Makefile
index 4fe32328cbed5c4d52c2aac7164c70f5c4173d15..9ffba2e9377ac0d99db0b8e193179c85244bb1f1 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ endif
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
 SUBDIRS	= tools \
-	  examples \
+	  examples/standalone \
 	  api_examples
 
 .PHONY : $(SUBDIRS)
@@ -3592,11 +3592,15 @@ grsim_leon2_config : unconfig
 #########################################################################
 
 clean:
-	@rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \
-	       $(obj)examples/hello_world  $(obj)examples/interrupt	  \
-	       $(obj)examples/mem_to_mem_idma2intr			  \
-	       $(obj)examples/sched	   $(obj)examples/smc91111_eeprom \
-	       $(obj)examples/test_burst   $(obj)examples/timer
+	@rm -f $(obj)examples/standalone/82559_eeprom			  \
+	       $(obj)examples/standalone/eepro100_eeprom		  \
+	       $(obj)examples/standalone/hello_world			  \
+	       $(obj)examples/standalone/interrupt			  \
+	       $(obj)examples/standalone/mem_to_mem_idma2intr		  \
+	       $(obj)examples/standalone/sched				  \
+	       $(obj)examples/standalone/smc91111_eeprom		  \
+	       $(obj)examples/standalone/test_burst			  \
+	       $(obj)examples/standalone/timer
 	@rm -f $(obj)tools/bmp_logo	   $(obj)tools/easylogo/easylogo  \
 	       $(obj)tools/env/{fw_printenv,fw_setenv}			  \
 	       $(obj)tools/envcrc					  \
diff --git a/examples/.gitignore b/examples/standalone/.gitignore
similarity index 100%
rename from examples/.gitignore
rename to examples/standalone/.gitignore
diff --git a/examples/82559_eeprom.c b/examples/standalone/82559_eeprom.c
similarity index 100%
rename from examples/82559_eeprom.c
rename to examples/standalone/82559_eeprom.c
diff --git a/examples/Makefile b/examples/standalone/Makefile
similarity index 100%
rename from examples/Makefile
rename to examples/standalone/Makefile
diff --git a/examples/README.smc91111_eeprom b/examples/standalone/README.smc91111_eeprom
similarity index 100%
rename from examples/README.smc91111_eeprom
rename to examples/standalone/README.smc91111_eeprom
diff --git a/examples/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c
similarity index 100%
rename from examples/eepro100_eeprom.c
rename to examples/standalone/eepro100_eeprom.c
diff --git a/examples/hello_world.c b/examples/standalone/hello_world.c
similarity index 100%
rename from examples/hello_world.c
rename to examples/standalone/hello_world.c
diff --git a/examples/interrupt.c b/examples/standalone/interrupt.c
similarity index 100%
rename from examples/interrupt.c
rename to examples/standalone/interrupt.c
diff --git a/examples/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
similarity index 100%
rename from examples/mem_to_mem_idma2intr.c
rename to examples/standalone/mem_to_mem_idma2intr.c
diff --git a/examples/mips.lds b/examples/standalone/mips.lds
similarity index 100%
rename from examples/mips.lds
rename to examples/standalone/mips.lds
diff --git a/examples/nios.lds b/examples/standalone/nios.lds
similarity index 100%
rename from examples/nios.lds
rename to examples/standalone/nios.lds
diff --git a/examples/nios2.lds b/examples/standalone/nios2.lds
similarity index 100%
rename from examples/nios2.lds
rename to examples/standalone/nios2.lds
diff --git a/examples/ppc_longjmp.S b/examples/standalone/ppc_longjmp.S
similarity index 100%
rename from examples/ppc_longjmp.S
rename to examples/standalone/ppc_longjmp.S
diff --git a/examples/ppc_setjmp.S b/examples/standalone/ppc_setjmp.S
similarity index 100%
rename from examples/ppc_setjmp.S
rename to examples/standalone/ppc_setjmp.S
diff --git a/examples/sched.c b/examples/standalone/sched.c
similarity index 100%
rename from examples/sched.c
rename to examples/standalone/sched.c
diff --git a/examples/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c
similarity index 100%
rename from examples/smc91111_eeprom.c
rename to examples/standalone/smc91111_eeprom.c
diff --git a/examples/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c
similarity index 100%
rename from examples/smc911x_eeprom.c
rename to examples/standalone/smc911x_eeprom.c
diff --git a/examples/sparc.lds b/examples/standalone/sparc.lds
similarity index 100%
rename from examples/sparc.lds
rename to examples/standalone/sparc.lds
diff --git a/examples/stubs.c b/examples/standalone/stubs.c
similarity index 100%
rename from examples/stubs.c
rename to examples/standalone/stubs.c
diff --git a/examples/test_burst.c b/examples/standalone/test_burst.c
similarity index 100%
rename from examples/test_burst.c
rename to examples/standalone/test_burst.c
diff --git a/examples/test_burst.h b/examples/standalone/test_burst.h
similarity index 100%
rename from examples/test_burst.h
rename to examples/standalone/test_burst.h
diff --git a/examples/test_burst_lib.S b/examples/standalone/test_burst_lib.S
similarity index 100%
rename from examples/test_burst_lib.S
rename to examples/standalone/test_burst_lib.S
diff --git a/examples/timer.c b/examples/standalone/timer.c
similarity index 100%
rename from examples/timer.c
rename to examples/standalone/timer.c
diff --git a/examples/x86-testapp.c b/examples/standalone/x86-testapp.c
similarity index 100%
rename from examples/x86-testapp.c
rename to examples/standalone/x86-testapp.c