diff --git a/CodingReadme b/CodingReadme
index f93d22050..a385a99dc 100644
--- a/CodingReadme
+++ b/CodingReadme
@@ -342,10 +342,10 @@ Then with default config setting:
 	./yosys -p 'synth; show' tests/simple/fiedler-cooley.v
 	./yosys -p 'synth_xilinx -top up3down5; show' tests/simple/fiedler-cooley.v
 
-	cd ~yosys/techlibs/cmos
+	cd ~yosys/examples/cmos
 	bash testbench.sh
 
-	cd ~yosys/techlibs/xilinx/example_basys3
+	cd ~yosys/examples/basys3
 	bash run.sh
 
 
diff --git a/README b/README
index 868fd90e1..6b637e1ec 100644
--- a/README
+++ b/README
@@ -190,7 +190,7 @@ for the given cell library:
 	clean
 
 If you do not have a liberty file but want to test this synthesis script,
-you can use the file techlibs/cmos/cmos_cells.lib from the yosys sources.
+you can use the file examples/cmos/cmos_cells.lib from the yosys sources.
 
 Various more complex liberty files (for testing) can be found here:
 
diff --git a/techlibs/xilinx/example_basys3/README b/examples/basys3/README
similarity index 78%
rename from techlibs/xilinx/example_basys3/README
rename to examples/basys3/README
index 85b6eab10..0ce717294 100644
--- a/techlibs/xilinx/example_basys3/README
+++ b/examples/basys3/README
@@ -2,6 +2,9 @@
 A simple example design, based on the Digilent BASYS3 board
 ===========================================================
 
+This example uses Yosys for synthesis and Xilinx Vivado
+for place&route and bit-stream creation.
+
 Running Yosys:
   yosys run_yosys.ys
 
diff --git a/techlibs/xilinx/example_basys3/example.v b/examples/basys3/example.v
similarity index 100%
rename from techlibs/xilinx/example_basys3/example.v
rename to examples/basys3/example.v
diff --git a/techlibs/xilinx/example_basys3/example.xdc b/examples/basys3/example.xdc
similarity index 100%
rename from techlibs/xilinx/example_basys3/example.xdc
rename to examples/basys3/example.xdc
diff --git a/techlibs/xilinx/example_basys3/run.sh b/examples/basys3/run.sh
similarity index 100%
rename from techlibs/xilinx/example_basys3/run.sh
rename to examples/basys3/run.sh
diff --git a/techlibs/xilinx/example_basys3/run_prog.tcl b/examples/basys3/run_prog.tcl
similarity index 100%
rename from techlibs/xilinx/example_basys3/run_prog.tcl
rename to examples/basys3/run_prog.tcl
diff --git a/techlibs/xilinx/example_basys3/run_vivado.tcl b/examples/basys3/run_vivado.tcl
similarity index 100%
rename from techlibs/xilinx/example_basys3/run_vivado.tcl
rename to examples/basys3/run_vivado.tcl
diff --git a/techlibs/xilinx/example_basys3/run_yosys.ys b/examples/basys3/run_yosys.ys
similarity index 100%
rename from techlibs/xilinx/example_basys3/run_yosys.ys
rename to examples/basys3/run_yosys.ys
diff --git a/techlibs/cmos/cmos_cells.lib b/examples/cmos/cmos_cells.lib
similarity index 100%
rename from techlibs/cmos/cmos_cells.lib
rename to examples/cmos/cmos_cells.lib
diff --git a/techlibs/cmos/cmos_cells.sp b/examples/cmos/cmos_cells.sp
similarity index 100%
rename from techlibs/cmos/cmos_cells.sp
rename to examples/cmos/cmos_cells.sp
diff --git a/techlibs/cmos/cmos_cells.v b/examples/cmos/cmos_cells.v
similarity index 100%
rename from techlibs/cmos/cmos_cells.v
rename to examples/cmos/cmos_cells.v
diff --git a/techlibs/cmos/counter.v b/examples/cmos/counter.v
similarity index 100%
rename from techlibs/cmos/counter.v
rename to examples/cmos/counter.v
diff --git a/techlibs/cmos/counter.ys b/examples/cmos/counter.ys
similarity index 100%
rename from techlibs/cmos/counter.ys
rename to examples/cmos/counter.ys
diff --git a/techlibs/cmos/testbench.sh b/examples/cmos/testbench.sh
similarity index 100%
rename from techlibs/cmos/testbench.sh
rename to examples/cmos/testbench.sh
diff --git a/techlibs/cmos/testbench.sp b/examples/cmos/testbench.sp
similarity index 100%
rename from techlibs/cmos/testbench.sp
rename to examples/cmos/testbench.sp
diff --git a/misc/example.cc b/examples/cxx-api/demomain.cc
similarity index 83%
rename from misc/example.cc
rename to examples/cxx-api/demomain.cc
index 2e35bcd46..a64593306 100644
--- a/misc/example.cc
+++ b/examples/cxx-api/demomain.cc
@@ -1,5 +1,5 @@
 // Note: Set ENABLE_LIBYOSYS=1 in Makefile or Makefile.conf to build libyosys.so
-// yosys-config --exec --cxx -o example --cxxflags --ldflags example.cc -lyosys -lstdc++
+// yosys-config --exec --cxx -o demomain --cxxflags --ldflags demomain.cc -lyosys -lstdc++
 
 #include <kernel/yosys.h>