diff --git a/README b/README
index 19e7bdf6..4e3b47c8 100644
--- a/README
+++ b/README
@@ -6,11 +6,11 @@ EFL usage in here should be using the latest APIs where possible and use support
 
 For C we are using meson to build - the standard steps are:
 
-  * mesin build/
+  * meson build/
   * cd build
   * ninja
 
 if, however, you have Edi installed then the edi_build command will run the appropriate steps automatically.
 
-Directory naming is <language>-<examplename> please be careful to namespace example binaries in case they are installed by the user.
+Directory naming is <type>/<language>/<name> please be careful to namespace example binaries in case they are installed by the user.
 
diff --git a/c-eo-classes/meson.build b/examples/c/eo-classes/meson.build
similarity index 100%
rename from c-eo-classes/meson.build
rename to examples/c/eo-classes/meson.build
diff --git a/c-eo-classes/src/eo_classes_main.c b/examples/c/eo-classes/src/eo_classes_main.c
similarity index 100%
rename from c-eo-classes/src/eo_classes_main.c
rename to examples/c/eo-classes/src/eo_classes_main.c
diff --git a/c-eo-classes/src/example_rectangle.c b/examples/c/eo-classes/src/example_rectangle.c
similarity index 100%
rename from c-eo-classes/src/example_rectangle.c
rename to examples/c/eo-classes/src/example_rectangle.c
diff --git a/c-eo-classes/src/example_rectangle.eo b/examples/c/eo-classes/src/example_rectangle.eo
similarity index 100%
rename from c-eo-classes/src/example_rectangle.eo
rename to examples/c/eo-classes/src/example_rectangle.eo
diff --git a/c-eo-classes/src/example_shape.c b/examples/c/eo-classes/src/example_shape.c
similarity index 100%
rename from c-eo-classes/src/example_shape.c
rename to examples/c/eo-classes/src/example_shape.c
diff --git a/c-eo-classes/src/example_shape.eo b/examples/c/eo-classes/src/example_shape.eo
similarity index 100%
rename from c-eo-classes/src/example_shape.eo
rename to examples/c/eo-classes/src/example_shape.eo
diff --git a/c-eo-classes/src/example_square.c b/examples/c/eo-classes/src/example_square.c
similarity index 100%
rename from c-eo-classes/src/example_square.c
rename to examples/c/eo-classes/src/example_square.c
diff --git a/c-eo-classes/src/example_square.eo b/examples/c/eo-classes/src/example_square.eo
similarity index 100%
rename from c-eo-classes/src/example_square.eo
rename to examples/c/eo-classes/src/example_square.eo
diff --git a/c-eo-classes/src/meson.build b/examples/c/eo-classes/src/meson.build
similarity index 100%
rename from c-eo-classes/src/meson.build
rename to examples/c/eo-classes/src/meson.build
diff --git a/c-eo-intro/meson.build b/examples/c/eo-intro/meson.build
similarity index 100%
rename from c-eo-intro/meson.build
rename to examples/c/eo-intro/meson.build
diff --git a/c-eo-intro/src/eo_intro_main.c b/examples/c/eo-intro/src/eo_intro_main.c
similarity index 100%
rename from c-eo-intro/src/eo_intro_main.c
rename to examples/c/eo-intro/src/eo_intro_main.c
diff --git a/c-eo-intro/src/meson.build b/examples/c/eo-intro/src/meson.build
similarity index 100%
rename from c-eo-intro/src/meson.build
rename to examples/c/eo-intro/src/meson.build
diff --git a/c-eo-refcount/meson.build b/examples/c/eo-refcount/meson.build
similarity index 100%
rename from c-eo-refcount/meson.build
rename to examples/c/eo-refcount/meson.build
diff --git a/c-eo-refcount/src/eo_refcount_main.c b/examples/c/eo-refcount/src/eo_refcount_main.c
similarity index 100%
rename from c-eo-refcount/src/eo_refcount_main.c
rename to examples/c/eo-refcount/src/eo_refcount_main.c
diff --git a/c-eo-refcount/src/meson.build b/examples/c/eo-refcount/src/meson.build
similarity index 100%
rename from c-eo-refcount/src/meson.build
rename to examples/c/eo-refcount/src/meson.build
diff --git a/c-cmdline/meson.build b/examples/c/hello-cmdline/meson.build
similarity index 100%
rename from c-cmdline/meson.build
rename to examples/c/hello-cmdline/meson.build
diff --git a/c-cmdline/src/cmdline_main.c b/examples/c/hello-cmdline/src/cmdline_main.c
similarity index 100%
rename from c-cmdline/src/cmdline_main.c
rename to examples/c/hello-cmdline/src/cmdline_main.c
diff --git a/c-cmdline/src/meson.build b/examples/c/hello-cmdline/src/meson.build
similarity index 100%
rename from c-cmdline/src/meson.build
rename to examples/c/hello-cmdline/src/meson.build
diff --git a/c-gui/meson.build b/examples/c/hello-gui/meson.build
similarity index 100%
rename from c-gui/meson.build
rename to examples/c/hello-gui/meson.build
diff --git a/c-gui/src/gui_main.c b/examples/c/hello-gui/src/gui_main.c
similarity index 100%
rename from c-gui/src/gui_main.c
rename to examples/c/hello-gui/src/gui_main.c
diff --git a/c-gui/src/meson.build b/examples/c/hello-gui/src/meson.build
similarity index 100%
rename from c-gui/src/meson.build
rename to examples/c/hello-gui/src/meson.build
diff --git a/c-lib/meson.build b/examples/c/lib/meson.build
similarity index 100%
rename from c-lib/meson.build
rename to examples/c/lib/meson.build
diff --git a/c-lib/src/lib/Example.h b/examples/c/lib/src/lib/Example.h
similarity index 100%
rename from c-lib/src/lib/Example.h
rename to examples/c/lib/src/lib/Example.h
diff --git a/c-lib/src/lib/example.c b/examples/c/lib/src/lib/example.c
similarity index 100%
rename from c-lib/src/lib/example.c
rename to examples/c/lib/src/lib/example.c
diff --git a/c-lib/src/lib/meson.build b/examples/c/lib/src/lib/meson.build
similarity index 100%
rename from c-lib/src/lib/meson.build
rename to examples/c/lib/src/lib/meson.build
diff --git a/c-lib/src/meson.build b/examples/c/lib/src/meson.build
similarity index 100%
rename from c-lib/src/meson.build
rename to examples/c/lib/src/meson.build
diff --git a/c-lib/src/test/meson.build b/examples/c/lib/src/test/meson.build
similarity index 100%
rename from c-lib/src/test/meson.build
rename to examples/c/lib/src/test/meson.build
diff --git a/c-lib/src/test/runner.c b/examples/c/lib/src/test/runner.c
similarity index 100%
rename from c-lib/src/test/runner.c
rename to examples/c/lib/src/test/runner.c
diff --git a/c-lib/src/test/suite.h b/examples/c/lib/src/test/suite.h
similarity index 100%
rename from c-lib/src/test/suite.h
rename to examples/c/lib/src/test/suite.h
diff --git a/c-lib/src/test/test_lib.c b/examples/c/lib/src/test/test_lib.c
similarity index 100%
rename from c-lib/src/test/test_lib.c
rename to examples/c/lib/src/test/test_lib.c
diff --git a/c-lifecycle/meson.build b/examples/c/lifecycle/meson.build
similarity index 100%
rename from c-lifecycle/meson.build
rename to examples/c/lifecycle/meson.build
diff --git a/c-lifecycle/src/lifecycle_main.c b/examples/c/lifecycle/src/lifecycle_main.c
similarity index 100%
rename from c-lifecycle/src/lifecycle_main.c
rename to examples/c/lifecycle/src/lifecycle_main.c
diff --git a/c-lifecycle/src/meson.build b/examples/c/lifecycle/src/meson.build
similarity index 100%
rename from c-lifecycle/src/meson.build
rename to examples/c/lifecycle/src/meson.build