diff --git a/scripts/compile_glyphs.rb b/scripts/compile_glyphs.rb
index ff8d23576..f9e185c4b 100755
--- a/scripts/compile_glyphs.rb
+++ b/scripts/compile_glyphs.rb
@@ -1,5 +1,12 @@
 #!/usr/bin/ruby 
 
+# Synopsis:
+#
+#   compile_glyphs.rb
+#
+# This script generates the src/db/db/glyphs.cc text generator's font definitions
+# from the GDS files placed inside the src/db/db/glyphs folder.
+
 files = []
 
 glyph_dir = File.join(File.dirname($0), "..", "src", "db", "db", "glyphs")
diff --git a/scripts/create_drc_samples.rb b/scripts/drc_lvs_doc/create_drc_samples.rb
similarity index 99%
rename from scripts/create_drc_samples.rb
rename to scripts/drc_lvs_doc/create_drc_samples.rb
index fb35b1a5a..5594555be 100644
--- a/scripts/create_drc_samples.rb
+++ b/scripts/drc_lvs_doc/create_drc_samples.rb
@@ -5,7 +5,7 @@
 class QRCGenerator
 
   def res_path 
-    "src/lay/lay"
+    "src/doc"
   end
 
   def img_path
@@ -13,7 +13,7 @@ class QRCGenerator
   end
 
   def initialize
-    @path = res_path + "/" + "layDRCLVSHelpResources.qrc"
+    @path = res_path + "/" + "docDRCLVSResources.qrc"
     @file = File.open(@path, "w")
     @file.puts("<RCC>")
     @file.puts(" <qresource prefix=\"/help/images\">")
diff --git a/scripts/extract_doc.rb b/scripts/drc_lvs_doc/extract_doc.rb
similarity index 99%
rename from scripts/extract_doc.rb
rename to scripts/drc_lvs_doc/extract_doc.rb
index f5338b5ac..cbbc4f42f 100755
--- a/scripts/extract_doc.rb
+++ b/scripts/drc_lvs_doc/extract_doc.rb
@@ -5,7 +5,7 @@ $script_call = $0 + " " + ARGV.join(" ")
 $indirs = [ "src/drc/drc/built-in-macros", "src/lvs/lvs/built-in-macros" ]
 
 $loc = "about"
-$outfiles = "src/lay/lay/doc"
+$outfiles = "src/doc/doc"
 
 def create_ref(mod, s)
   if s =~ /(.*)::(.*)#(.*)/
diff --git a/scripts/klayoutrc_drc_samples b/scripts/drc_lvs_doc/klayoutrc_drc_samples
similarity index 100%
rename from scripts/klayoutrc_drc_samples
rename to scripts/drc_lvs_doc/klayoutrc_drc_samples
diff --git a/scripts/make_drc_lvs_doc.sh b/scripts/make_drc_lvs_doc.sh
index c03fcc593..5394d476e 100755
--- a/scripts/make_drc_lvs_doc.sh
+++ b/scripts/make_drc_lvs_doc.sh
@@ -1,14 +1,27 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 inst=$(realpath $(dirname $0))
+scripts=${inst}/drc_lvs_doc
 ld=$(realpath .)
 
 bin="$ld/klayout"
 
 export LD_LIBRARY_PATH=$ld
+export KLAYOUT_HOME=/dev/null
+
+doc_src=../src/doc/doc
+if ! [ -e $doc_src ]; then
+  echo "*** ERROR: missing doc sources ($doc_src) - did you run the script from the build folder below the source tree?"
+  exit 1
+fi
+
+if ! [ -e $bin ]; then
+  echo "*** ERROR: missing klayout binary ($bin) - did you run the script from the build folder?"
+  exit 1
+fi
 
 cd $inst/..
 
-$bin -z -r $inst/create_drc_samples.rb -t -c $inst/klayoutrc_drc_samples
-$inst/extract_doc.rb
+$bin -z -r ${scripts}/create_drc_samples.rb -t -c ${scripts}/klayoutrc_drc_samples
+${scripts}/extract_doc.rb
 
diff --git a/src/doc/doc.pro b/src/doc/doc.pro
new file mode 100644
index 000000000..c1caf249f
--- /dev/null
+++ b/src/doc/doc.pro
@@ -0,0 +1,19 @@
+
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_doc
+
+include($$PWD/../lib.pri)
+
+DEFINES += MAKE_DOC_LIBRARY
+
+HEADERS = \
+
+FORMS = \
+
+SOURCES = \
+    docForceLink.cc \
+
+RESOURCES = \
+    docResources.qrc \
+    docDRCLVSResources.qrc \
+
diff --git a/src/lay/lay/doc/about/25d_screenshot.png b/src/doc/doc/about/25d_screenshot.png
similarity index 100%
rename from src/lay/lay/doc/about/25d_screenshot.png
rename to src/doc/doc/about/25d_screenshot.png
diff --git a/src/lay/lay/doc/about/25d_screenshot2.png b/src/doc/doc/about/25d_screenshot2.png
similarity index 100%
rename from src/lay/lay/doc/about/25d_screenshot2.png
rename to src/doc/doc/about/25d_screenshot2.png
diff --git a/src/lay/lay/doc/about/25d_view.xml b/src/doc/doc/about/25d_view.xml
similarity index 100%
rename from src/lay/lay/doc/about/25d_view.xml
rename to src/doc/doc/about/25d_view.xml
diff --git a/src/lay/lay/doc/about/about_libraries.xml b/src/doc/doc/about/about_libraries.xml
similarity index 100%
rename from src/lay/lay/doc/about/about_libraries.xml
rename to src/doc/doc/about/about_libraries.xml
diff --git a/src/lay/lay/doc/about/about_pcells.xml b/src/doc/doc/about/about_pcells.xml
similarity index 100%
rename from src/lay/lay/doc/about/about_pcells.xml
rename to src/doc/doc/about/about_pcells.xml
diff --git a/src/lay/lay/doc/about/basic_lib.xml b/src/doc/doc/about/basic_lib.xml
similarity index 100%
rename from src/lay/lay/doc/about/basic_lib.xml
rename to src/doc/doc/about/basic_lib.xml
diff --git a/src/lay/lay/doc/about/basic_text.png b/src/doc/doc/about/basic_text.png
similarity index 100%
rename from src/lay/lay/doc/about/basic_text.png
rename to src/doc/doc/about/basic_text.png
diff --git a/src/lay/lay/doc/about/connectivity.xml b/src/doc/doc/about/connectivity.xml
similarity index 100%
rename from src/lay/lay/doc/about/connectivity.xml
rename to src/doc/doc/about/connectivity.xml
diff --git a/src/lay/lay/doc/about/custom_queries.xml b/src/doc/doc/about/custom_queries.xml
similarity index 100%
rename from src/lay/lay/doc/about/custom_queries.xml
rename to src/doc/doc/about/custom_queries.xml
diff --git a/src/lay/lay/doc/about/def_import_snapshot.png b/src/doc/doc/about/def_import_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/def_import_snapshot.png
rename to src/doc/doc/about/def_import_snapshot.png
diff --git a/src/lay/lay/doc/about/drc_ref.xml b/src/doc/doc/about/drc_ref.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref.xml
rename to src/doc/doc/about/drc_ref.xml
diff --git a/src/lay/lay/doc/about/drc_ref_drc.xml b/src/doc/doc/about/drc_ref_drc.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_drc.xml
rename to src/doc/doc/about/drc_ref_drc.xml
diff --git a/src/lay/lay/doc/about/drc_ref_expressions.xml b/src/doc/doc/about/drc_ref_expressions.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_expressions.xml
rename to src/doc/doc/about/drc_ref_expressions.xml
diff --git a/src/lay/lay/doc/about/drc_ref_global.xml b/src/doc/doc/about/drc_ref_global.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_global.xml
rename to src/doc/doc/about/drc_ref_global.xml
diff --git a/src/lay/lay/doc/about/drc_ref_layer.xml b/src/doc/doc/about/drc_ref_layer.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_layer.xml
rename to src/doc/doc/about/drc_ref_layer.xml
diff --git a/src/lay/lay/doc/about/drc_ref_netter.xml b/src/doc/doc/about/drc_ref_netter.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_netter.xml
rename to src/doc/doc/about/drc_ref_netter.xml
diff --git a/src/lay/lay/doc/about/drc_ref_source.xml b/src/doc/doc/about/drc_ref_source.xml
similarity index 100%
rename from src/lay/lay/doc/about/drc_ref_source.xml
rename to src/doc/doc/about/drc_ref_source.xml
diff --git a/src/lay/lay/doc/about/expressions.xml b/src/doc/doc/about/expressions.xml
similarity index 100%
rename from src/lay/lay/doc/about/expressions.xml
rename to src/doc/doc/about/expressions.xml
diff --git a/src/lay/lay/doc/about/ide_browser_toolbar.png b/src/doc/doc/about/ide_browser_toolbar.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_browser_toolbar.png
rename to src/doc/doc/about/ide_browser_toolbar.png
diff --git a/src/lay/lay/doc/about/ide_console.png b/src/doc/doc/about/ide_console.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_console.png
rename to src/doc/doc/about/ide_console.png
diff --git a/src/lay/lay/doc/about/ide_debugging_snapshot.png b/src/doc/doc/about/ide_debugging_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_debugging_snapshot.png
rename to src/doc/doc/about/ide_debugging_snapshot.png
diff --git a/src/lay/lay/doc/about/ide_editor_toolbar.png b/src/doc/doc/about/ide_editor_toolbar.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_editor_toolbar.png
rename to src/doc/doc/about/ide_editor_toolbar.png
diff --git a/src/lay/lay/doc/about/ide_py_debugging_snapshot.png b/src/doc/doc/about/ide_py_debugging_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_py_debugging_snapshot.png
rename to src/doc/doc/about/ide_py_debugging_snapshot.png
diff --git a/src/lay/lay/doc/about/ide_snapshot.png b/src/doc/doc/about/ide_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/ide_snapshot.png
rename to src/doc/doc/about/ide_snapshot.png
diff --git a/src/lay/lay/doc/about/index.xml b/src/doc/doc/about/index.xml
similarity index 100%
rename from src/lay/lay/doc/about/index.xml
rename to src/doc/doc/about/index.xml
diff --git a/src/lay/lay/doc/about/layer_mapping.xml b/src/doc/doc/about/layer_mapping.xml
similarity index 100%
rename from src/lay/lay/doc/about/layer_mapping.xml
rename to src/doc/doc/about/layer_mapping.xml
diff --git a/src/lay/lay/doc/about/layer_sources.xml b/src/doc/doc/about/layer_sources.xml
similarity index 100%
rename from src/lay/lay/doc/about/layer_sources.xml
rename to src/doc/doc/about/layer_sources.xml
diff --git a/src/lay/lay/doc/about/layer_specs.xml b/src/doc/doc/about/layer_specs.xml
similarity index 100%
rename from src/lay/lay/doc/about/layer_specs.xml
rename to src/doc/doc/about/layer_specs.xml
diff --git a/src/lay/lay/doc/about/lef_def_import.xml b/src/doc/doc/about/lef_def_import.xml
similarity index 100%
rename from src/lay/lay/doc/about/lef_def_import.xml
rename to src/doc/doc/about/lef_def_import.xml
diff --git a/src/lay/lay/doc/about/lef_import_snapshot.png b/src/doc/doc/about/lef_import_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/lef_import_snapshot.png
rename to src/doc/doc/about/lef_import_snapshot.png
diff --git a/src/lay/lay/doc/about/lefdef_options_snapshot.png b/src/doc/doc/about/lefdef_options_snapshot.png
similarity index 100%
rename from src/lay/lay/doc/about/lefdef_options_snapshot.png
rename to src/doc/doc/about/lefdef_options_snapshot.png
diff --git a/src/lay/lay/doc/about/lvs_ref.xml b/src/doc/doc/about/lvs_ref.xml
similarity index 100%
rename from src/lay/lay/doc/about/lvs_ref.xml
rename to src/doc/doc/about/lvs_ref.xml
diff --git a/src/lay/lay/doc/about/lvs_ref_global.xml b/src/doc/doc/about/lvs_ref_global.xml
similarity index 100%
rename from src/lay/lay/doc/about/lvs_ref_global.xml
rename to src/doc/doc/about/lvs_ref_global.xml
diff --git a/src/lay/lay/doc/about/lvs_ref_netter.xml b/src/doc/doc/about/lvs_ref_netter.xml
similarity index 100%
rename from src/lay/lay/doc/about/lvs_ref_netter.xml
rename to src/doc/doc/about/lvs_ref_netter.xml
diff --git a/src/lay/lay/doc/about/macro_editor.xml b/src/doc/doc/about/macro_editor.xml
similarity index 100%
rename from src/lay/lay/doc/about/macro_editor.xml
rename to src/doc/doc/about/macro_editor.xml
diff --git a/src/lay/lay/doc/about/macro_in_menu.xml b/src/doc/doc/about/macro_in_menu.xml
similarity index 100%
rename from src/lay/lay/doc/about/macro_in_menu.xml
rename to src/doc/doc/about/macro_in_menu.xml
diff --git a/src/lay/lay/doc/about/packages.xml b/src/doc/doc/about/packages.xml
similarity index 100%
rename from src/lay/lay/doc/about/packages.xml
rename to src/doc/doc/about/packages.xml
diff --git a/src/lay/lay/doc/about/pie_arc.png b/src/doc/doc/about/pie_arc.png
similarity index 100%
rename from src/lay/lay/doc/about/pie_arc.png
rename to src/doc/doc/about/pie_arc.png
diff --git a/src/lay/lay/doc/about/rba_notation.xml b/src/doc/doc/about/rba_notation.xml
similarity index 100%
rename from src/lay/lay/doc/about/rba_notation.xml
rename to src/doc/doc/about/rba_notation.xml
diff --git a/src/lay/lay/doc/about/round_path.png b/src/doc/doc/about/round_path.png
similarity index 100%
rename from src/lay/lay/doc/about/round_path.png
rename to src/doc/doc/about/round_path.png
diff --git a/src/lay/lay/doc/about/round_polygon.png b/src/doc/doc/about/round_polygon.png
similarity index 100%
rename from src/lay/lay/doc/about/round_polygon.png
rename to src/doc/doc/about/round_polygon.png
diff --git a/src/lay/lay/doc/about/stroked_polygon.png b/src/doc/doc/about/stroked_polygon.png
similarity index 100%
rename from src/lay/lay/doc/about/stroked_polygon.png
rename to src/doc/doc/about/stroked_polygon.png
diff --git a/src/lay/lay/doc/about/symbolic_layers.xml b/src/doc/doc/about/symbolic_layers.xml
similarity index 100%
rename from src/lay/lay/doc/about/symbolic_layers.xml
rename to src/doc/doc/about/symbolic_layers.xml
diff --git a/src/lay/lay/doc/about/technology_manager.xml b/src/doc/doc/about/technology_manager.xml
similarity index 100%
rename from src/lay/lay/doc/about/technology_manager.xml
rename to src/doc/doc/about/technology_manager.xml
diff --git a/src/lay/lay/doc/about/transformation_basic.png b/src/doc/doc/about/transformation_basic.png
similarity index 100%
rename from src/lay/lay/doc/about/transformation_basic.png
rename to src/doc/doc/about/transformation_basic.png
diff --git a/src/lay/lay/doc/about/transformation_overview.png b/src/doc/doc/about/transformation_overview.png
similarity index 100%
rename from src/lay/lay/doc/about/transformation_overview.png
rename to src/doc/doc/about/transformation_overview.png
diff --git a/src/lay/lay/doc/about/transformations.xml b/src/doc/doc/about/transformations.xml
similarity index 100%
rename from src/lay/lay/doc/about/transformations.xml
rename to src/doc/doc/about/transformations.xml
diff --git a/src/lay/lay/doc/about/variant_notation.xml b/src/doc/doc/about/variant_notation.xml
similarity index 100%
rename from src/lay/lay/doc/about/variant_notation.xml
rename to src/doc/doc/about/variant_notation.xml
diff --git a/src/lay/lay/doc/help_format.css b/src/doc/doc/help_format.css
similarity index 100%
rename from src/lay/lay/doc/help_format.css
rename to src/doc/doc/help_format.css
diff --git a/src/lay/lay/doc/images/drc_and1.png b/src/doc/doc/images/drc_and1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_and1.png
rename to src/doc/doc/images/drc_and1.png
diff --git a/src/lay/lay/doc/images/drc_and2.png b/src/doc/doc/images/drc_and2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_and2.png
rename to src/doc/doc/images/drc_and2.png
diff --git a/src/lay/lay/doc/images/drc_and3.png b/src/doc/doc/images/drc_and3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_and3.png
rename to src/doc/doc/images/drc_and3.png
diff --git a/src/lay/lay/doc/images/drc_centers1.png b/src/doc/doc/images/drc_centers1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_centers1.png
rename to src/doc/doc/images/drc_centers1.png
diff --git a/src/lay/lay/doc/images/drc_centers2.png b/src/doc/doc/images/drc_centers2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_centers2.png
rename to src/doc/doc/images/drc_centers2.png
diff --git a/src/lay/lay/doc/images/drc_corners1.png b/src/doc/doc/images/drc_corners1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_corners1.png
rename to src/doc/doc/images/drc_corners1.png
diff --git a/src/lay/lay/doc/images/drc_corners2.png b/src/doc/doc/images/drc_corners2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_corners2.png
rename to src/doc/doc/images/drc_corners2.png
diff --git a/src/lay/lay/doc/images/drc_corners3.png b/src/doc/doc/images/drc_corners3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_corners3.png
rename to src/doc/doc/images/drc_corners3.png
diff --git a/src/lay/lay/doc/images/drc_covering.png b/src/doc/doc/images/drc_covering.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_covering.png
rename to src/doc/doc/images/drc_covering.png
diff --git a/src/lay/lay/doc/images/drc_enc1.png b/src/doc/doc/images/drc_enc1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_enc1.png
rename to src/doc/doc/images/drc_enc1.png
diff --git a/src/lay/lay/doc/images/drc_enc1u.png b/src/doc/doc/images/drc_enc1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_enc1u.png
rename to src/doc/doc/images/drc_enc1u.png
diff --git a/src/lay/lay/doc/images/drc_enc2.png b/src/doc/doc/images/drc_enc2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_enc2.png
rename to src/doc/doc/images/drc_enc2.png
diff --git a/src/lay/lay/doc/images/drc_enc2u.png b/src/doc/doc/images/drc_enc2u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_enc2u.png
rename to src/doc/doc/images/drc_enc2u.png
diff --git a/src/lay/lay/doc/images/drc_encd1.png b/src/doc/doc/images/drc_encd1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_encd1.png
rename to src/doc/doc/images/drc_encd1.png
diff --git a/src/lay/lay/doc/images/drc_encd1u.png b/src/doc/doc/images/drc_encd1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_encd1u.png
rename to src/doc/doc/images/drc_encd1u.png
diff --git a/src/lay/lay/doc/images/drc_encd2.png b/src/doc/doc/images/drc_encd2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_encd2.png
rename to src/doc/doc/images/drc_encd2.png
diff --git a/src/lay/lay/doc/images/drc_encd2u.png b/src/doc/doc/images/drc_encd2u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_encd2u.png
rename to src/doc/doc/images/drc_encd2u.png
diff --git a/src/lay/lay/doc/images/drc_end_segments1.png b/src/doc/doc/images/drc_end_segments1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_end_segments1.png
rename to src/doc/doc/images/drc_end_segments1.png
diff --git a/src/lay/lay/doc/images/drc_end_segments2.png b/src/doc/doc/images/drc_end_segments2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_end_segments2.png
rename to src/doc/doc/images/drc_end_segments2.png
diff --git a/src/lay/lay/doc/images/drc_extended1.png b/src/doc/doc/images/drc_extended1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extended1.png
rename to src/doc/doc/images/drc_extended1.png
diff --git a/src/lay/lay/doc/images/drc_extended2.png b/src/doc/doc/images/drc_extended2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extended2.png
rename to src/doc/doc/images/drc_extended2.png
diff --git a/src/lay/lay/doc/images/drc_extended3.png b/src/doc/doc/images/drc_extended3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extended3.png
rename to src/doc/doc/images/drc_extended3.png
diff --git a/src/lay/lay/doc/images/drc_extended4.png b/src/doc/doc/images/drc_extended4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extended4.png
rename to src/doc/doc/images/drc_extended4.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs1.png b/src/doc/doc/images/drc_extent_refs1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs1.png
rename to src/doc/doc/images/drc_extent_refs1.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs10.png b/src/doc/doc/images/drc_extent_refs10.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs10.png
rename to src/doc/doc/images/drc_extent_refs10.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs11.png b/src/doc/doc/images/drc_extent_refs11.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs11.png
rename to src/doc/doc/images/drc_extent_refs11.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs12.png b/src/doc/doc/images/drc_extent_refs12.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs12.png
rename to src/doc/doc/images/drc_extent_refs12.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs13.png b/src/doc/doc/images/drc_extent_refs13.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs13.png
rename to src/doc/doc/images/drc_extent_refs13.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs20.png b/src/doc/doc/images/drc_extent_refs20.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs20.png
rename to src/doc/doc/images/drc_extent_refs20.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs21.png b/src/doc/doc/images/drc_extent_refs21.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs21.png
rename to src/doc/doc/images/drc_extent_refs21.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs22.png b/src/doc/doc/images/drc_extent_refs22.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs22.png
rename to src/doc/doc/images/drc_extent_refs22.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs23.png b/src/doc/doc/images/drc_extent_refs23.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs23.png
rename to src/doc/doc/images/drc_extent_refs23.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs24.png b/src/doc/doc/images/drc_extent_refs24.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs24.png
rename to src/doc/doc/images/drc_extent_refs24.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs25.png b/src/doc/doc/images/drc_extent_refs25.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs25.png
rename to src/doc/doc/images/drc_extent_refs25.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs26.png b/src/doc/doc/images/drc_extent_refs26.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs26.png
rename to src/doc/doc/images/drc_extent_refs26.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs27.png b/src/doc/doc/images/drc_extent_refs27.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs27.png
rename to src/doc/doc/images/drc_extent_refs27.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs30.png b/src/doc/doc/images/drc_extent_refs30.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs30.png
rename to src/doc/doc/images/drc_extent_refs30.png
diff --git a/src/lay/lay/doc/images/drc_extent_refs31.png b/src/doc/doc/images/drc_extent_refs31.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extent_refs31.png
rename to src/doc/doc/images/drc_extent_refs31.png
diff --git a/src/lay/lay/doc/images/drc_extents1.png b/src/doc/doc/images/drc_extents1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extents1.png
rename to src/doc/doc/images/drc_extents1.png
diff --git a/src/lay/lay/doc/images/drc_extents2.png b/src/doc/doc/images/drc_extents2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_extents2.png
rename to src/doc/doc/images/drc_extents2.png
diff --git a/src/lay/lay/doc/images/drc_holes.png b/src/doc/doc/images/drc_holes.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_holes.png
rename to src/doc/doc/images/drc_holes.png
diff --git a/src/lay/lay/doc/images/drc_hulls.png b/src/doc/doc/images/drc_hulls.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_hulls.png
rename to src/doc/doc/images/drc_hulls.png
diff --git a/src/lay/lay/doc/images/drc_in.png b/src/doc/doc/images/drc_in.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_in.png
rename to src/doc/doc/images/drc_in.png
diff --git a/src/lay/lay/doc/images/drc_inside.png b/src/doc/doc/images/drc_inside.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_inside.png
rename to src/doc/doc/images/drc_inside.png
diff --git a/src/lay/lay/doc/images/drc_inside_ee.png b/src/doc/doc/images/drc_inside_ee.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_inside_ee.png
rename to src/doc/doc/images/drc_inside_ee.png
diff --git a/src/lay/lay/doc/images/drc_inside_ep.png b/src/doc/doc/images/drc_inside_ep.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_inside_ep.png
rename to src/doc/doc/images/drc_inside_ep.png
diff --git a/src/lay/lay/doc/images/drc_inside_part.png b/src/doc/doc/images/drc_inside_part.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_inside_part.png
rename to src/doc/doc/images/drc_inside_part.png
diff --git a/src/lay/lay/doc/images/drc_interacting.png b/src/doc/doc/images/drc_interacting.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_interacting.png
rename to src/doc/doc/images/drc_interacting.png
diff --git a/src/lay/lay/doc/images/drc_interacting2.png b/src/doc/doc/images/drc_interacting2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_interacting2.png
rename to src/doc/doc/images/drc_interacting2.png
diff --git a/src/lay/lay/doc/images/drc_interacting3.png b/src/doc/doc/images/drc_interacting3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_interacting3.png
rename to src/doc/doc/images/drc_interacting3.png
diff --git a/src/lay/lay/doc/images/drc_interacting4.png b/src/doc/doc/images/drc_interacting4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_interacting4.png
rename to src/doc/doc/images/drc_interacting4.png
diff --git a/src/lay/lay/doc/images/drc_interacting5.png b/src/doc/doc/images/drc_interacting5.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_interacting5.png
rename to src/doc/doc/images/drc_interacting5.png
diff --git a/src/lay/lay/doc/images/drc_join1.png b/src/doc/doc/images/drc_join1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_join1.png
rename to src/doc/doc/images/drc_join1.png
diff --git a/src/lay/lay/doc/images/drc_join2.png b/src/doc/doc/images/drc_join2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_join2.png
rename to src/doc/doc/images/drc_join2.png
diff --git a/src/lay/lay/doc/images/drc_merged1.png b/src/doc/doc/images/drc_merged1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_merged1.png
rename to src/doc/doc/images/drc_merged1.png
diff --git a/src/lay/lay/doc/images/drc_merged2.png b/src/doc/doc/images/drc_merged2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_merged2.png
rename to src/doc/doc/images/drc_merged2.png
diff --git a/src/lay/lay/doc/images/drc_merged3.png b/src/doc/doc/images/drc_merged3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_merged3.png
rename to src/doc/doc/images/drc_merged3.png
diff --git a/src/lay/lay/doc/images/drc_merged4.png b/src/doc/doc/images/drc_merged4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_merged4.png
rename to src/doc/doc/images/drc_merged4.png
diff --git a/src/lay/lay/doc/images/drc_middle1.png b/src/doc/doc/images/drc_middle1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_middle1.png
rename to src/doc/doc/images/drc_middle1.png
diff --git a/src/lay/lay/doc/images/drc_moved1.png b/src/doc/doc/images/drc_moved1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_moved1.png
rename to src/doc/doc/images/drc_moved1.png
diff --git a/src/lay/lay/doc/images/drc_not1.png b/src/doc/doc/images/drc_not1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not1.png
rename to src/doc/doc/images/drc_not1.png
diff --git a/src/lay/lay/doc/images/drc_not2.png b/src/doc/doc/images/drc_not2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not2.png
rename to src/doc/doc/images/drc_not2.png
diff --git a/src/lay/lay/doc/images/drc_not3.png b/src/doc/doc/images/drc_not3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not3.png
rename to src/doc/doc/images/drc_not3.png
diff --git a/src/lay/lay/doc/images/drc_not_covering.png b/src/doc/doc/images/drc_not_covering.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_covering.png
rename to src/doc/doc/images/drc_not_covering.png
diff --git a/src/lay/lay/doc/images/drc_not_in.png b/src/doc/doc/images/drc_not_in.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_in.png
rename to src/doc/doc/images/drc_not_in.png
diff --git a/src/lay/lay/doc/images/drc_not_inside.png b/src/doc/doc/images/drc_not_inside.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_inside.png
rename to src/doc/doc/images/drc_not_inside.png
diff --git a/src/lay/lay/doc/images/drc_not_inside_ee.png b/src/doc/doc/images/drc_not_inside_ee.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_inside_ee.png
rename to src/doc/doc/images/drc_not_inside_ee.png
diff --git a/src/lay/lay/doc/images/drc_not_inside_ep.png b/src/doc/doc/images/drc_not_inside_ep.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_inside_ep.png
rename to src/doc/doc/images/drc_not_inside_ep.png
diff --git a/src/lay/lay/doc/images/drc_not_interacting.png b/src/doc/doc/images/drc_not_interacting.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_interacting.png
rename to src/doc/doc/images/drc_not_interacting.png
diff --git a/src/lay/lay/doc/images/drc_not_interacting2.png b/src/doc/doc/images/drc_not_interacting2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_interacting2.png
rename to src/doc/doc/images/drc_not_interacting2.png
diff --git a/src/lay/lay/doc/images/drc_not_interacting3.png b/src/doc/doc/images/drc_not_interacting3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_interacting3.png
rename to src/doc/doc/images/drc_not_interacting3.png
diff --git a/src/lay/lay/doc/images/drc_not_interacting4.png b/src/doc/doc/images/drc_not_interacting4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_interacting4.png
rename to src/doc/doc/images/drc_not_interacting4.png
diff --git a/src/lay/lay/doc/images/drc_not_interacting5.png b/src/doc/doc/images/drc_not_interacting5.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_interacting5.png
rename to src/doc/doc/images/drc_not_interacting5.png
diff --git a/src/lay/lay/doc/images/drc_not_outside.png b/src/doc/doc/images/drc_not_outside.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_outside.png
rename to src/doc/doc/images/drc_not_outside.png
diff --git a/src/lay/lay/doc/images/drc_not_outside_ee.png b/src/doc/doc/images/drc_not_outside_ee.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_outside_ee.png
rename to src/doc/doc/images/drc_not_outside_ee.png
diff --git a/src/lay/lay/doc/images/drc_not_outside_ep.png b/src/doc/doc/images/drc_not_outside_ep.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_outside_ep.png
rename to src/doc/doc/images/drc_not_outside_ep.png
diff --git a/src/lay/lay/doc/images/drc_not_overlapping.png b/src/doc/doc/images/drc_not_overlapping.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_not_overlapping.png
rename to src/doc/doc/images/drc_not_overlapping.png
diff --git a/src/lay/lay/doc/images/drc_or1.png b/src/doc/doc/images/drc_or1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_or1.png
rename to src/doc/doc/images/drc_or1.png
diff --git a/src/lay/lay/doc/images/drc_or2.png b/src/doc/doc/images/drc_or2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_or2.png
rename to src/doc/doc/images/drc_or2.png
diff --git a/src/lay/lay/doc/images/drc_outside.png b/src/doc/doc/images/drc_outside.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_outside.png
rename to src/doc/doc/images/drc_outside.png
diff --git a/src/lay/lay/doc/images/drc_outside_ee.png b/src/doc/doc/images/drc_outside_ee.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_outside_ee.png
rename to src/doc/doc/images/drc_outside_ee.png
diff --git a/src/lay/lay/doc/images/drc_outside_ep.png b/src/doc/doc/images/drc_outside_ep.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_outside_ep.png
rename to src/doc/doc/images/drc_outside_ep.png
diff --git a/src/lay/lay/doc/images/drc_outside_part.png b/src/doc/doc/images/drc_outside_part.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_outside_part.png
rename to src/doc/doc/images/drc_outside_part.png
diff --git a/src/lay/lay/doc/images/drc_overlap1.png b/src/doc/doc/images/drc_overlap1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_overlap1.png
rename to src/doc/doc/images/drc_overlap1.png
diff --git a/src/lay/lay/doc/images/drc_overlap1u.png b/src/doc/doc/images/drc_overlap1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_overlap1u.png
rename to src/doc/doc/images/drc_overlap1u.png
diff --git a/src/lay/lay/doc/images/drc_overlap2.png b/src/doc/doc/images/drc_overlap2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_overlap2.png
rename to src/doc/doc/images/drc_overlap2.png
diff --git a/src/lay/lay/doc/images/drc_overlap2u.png b/src/doc/doc/images/drc_overlap2u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_overlap2u.png
rename to src/doc/doc/images/drc_overlap2u.png
diff --git a/src/lay/lay/doc/images/drc_overlapping.png b/src/doc/doc/images/drc_overlapping.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_overlapping.png
rename to src/doc/doc/images/drc_overlapping.png
diff --git a/src/lay/lay/doc/images/drc_raw1.png b/src/doc/doc/images/drc_raw1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_raw1.png
rename to src/doc/doc/images/drc_raw1.png
diff --git a/src/lay/lay/doc/images/drc_raw2.png b/src/doc/doc/images/drc_raw2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_raw2.png
rename to src/doc/doc/images/drc_raw2.png
diff --git a/src/lay/lay/doc/images/drc_raw3.png b/src/doc/doc/images/drc_raw3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_raw3.png
rename to src/doc/doc/images/drc_raw3.png
diff --git a/src/lay/lay/doc/images/drc_rotated1.png b/src/doc/doc/images/drc_rotated1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_rotated1.png
rename to src/doc/doc/images/drc_rotated1.png
diff --git a/src/lay/lay/doc/images/drc_rounded_corners.png b/src/doc/doc/images/drc_rounded_corners.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_rounded_corners.png
rename to src/doc/doc/images/drc_rounded_corners.png
diff --git a/src/lay/lay/doc/images/drc_scaled1.png b/src/doc/doc/images/drc_scaled1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_scaled1.png
rename to src/doc/doc/images/drc_scaled1.png
diff --git a/src/lay/lay/doc/images/drc_separation1.png b/src/doc/doc/images/drc_separation1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation1.png
rename to src/doc/doc/images/drc_separation1.png
diff --git a/src/lay/lay/doc/images/drc_separation10.png b/src/doc/doc/images/drc_separation10.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation10.png
rename to src/doc/doc/images/drc_separation10.png
diff --git a/src/lay/lay/doc/images/drc_separation11.png b/src/doc/doc/images/drc_separation11.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation11.png
rename to src/doc/doc/images/drc_separation11.png
diff --git a/src/lay/lay/doc/images/drc_separation1u.png b/src/doc/doc/images/drc_separation1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation1u.png
rename to src/doc/doc/images/drc_separation1u.png
diff --git a/src/lay/lay/doc/images/drc_separation1un.png b/src/doc/doc/images/drc_separation1un.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation1un.png
rename to src/doc/doc/images/drc_separation1un.png
diff --git a/src/lay/lay/doc/images/drc_separation2.png b/src/doc/doc/images/drc_separation2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation2.png
rename to src/doc/doc/images/drc_separation2.png
diff --git a/src/lay/lay/doc/images/drc_separation3.png b/src/doc/doc/images/drc_separation3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation3.png
rename to src/doc/doc/images/drc_separation3.png
diff --git a/src/lay/lay/doc/images/drc_separation4.png b/src/doc/doc/images/drc_separation4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation4.png
rename to src/doc/doc/images/drc_separation4.png
diff --git a/src/lay/lay/doc/images/drc_separation5.png b/src/doc/doc/images/drc_separation5.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation5.png
rename to src/doc/doc/images/drc_separation5.png
diff --git a/src/lay/lay/doc/images/drc_separation6.png b/src/doc/doc/images/drc_separation6.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation6.png
rename to src/doc/doc/images/drc_separation6.png
diff --git a/src/lay/lay/doc/images/drc_separation7.png b/src/doc/doc/images/drc_separation7.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation7.png
rename to src/doc/doc/images/drc_separation7.png
diff --git a/src/lay/lay/doc/images/drc_separation8.png b/src/doc/doc/images/drc_separation8.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation8.png
rename to src/doc/doc/images/drc_separation8.png
diff --git a/src/lay/lay/doc/images/drc_separation9.png b/src/doc/doc/images/drc_separation9.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_separation9.png
rename to src/doc/doc/images/drc_separation9.png
diff --git a/src/lay/lay/doc/images/drc_shielded1.png b/src/doc/doc/images/drc_shielded1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_shielded1.png
rename to src/doc/doc/images/drc_shielded1.png
diff --git a/src/lay/lay/doc/images/drc_shielded2.png b/src/doc/doc/images/drc_shielded2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_shielded2.png
rename to src/doc/doc/images/drc_shielded2.png
diff --git a/src/lay/lay/doc/images/drc_shielded3.png b/src/doc/doc/images/drc_shielded3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_shielded3.png
rename to src/doc/doc/images/drc_shielded3.png
diff --git a/src/lay/lay/doc/images/drc_shielded4.png b/src/doc/doc/images/drc_shielded4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_shielded4.png
rename to src/doc/doc/images/drc_shielded4.png
diff --git a/src/lay/lay/doc/images/drc_sized1.png b/src/doc/doc/images/drc_sized1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized1.png
rename to src/doc/doc/images/drc_sized1.png
diff --git a/src/lay/lay/doc/images/drc_sized2.png b/src/doc/doc/images/drc_sized2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized2.png
rename to src/doc/doc/images/drc_sized2.png
diff --git a/src/lay/lay/doc/images/drc_sized3.png b/src/doc/doc/images/drc_sized3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized3.png
rename to src/doc/doc/images/drc_sized3.png
diff --git a/src/lay/lay/doc/images/drc_sized4.png b/src/doc/doc/images/drc_sized4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized4.png
rename to src/doc/doc/images/drc_sized4.png
diff --git a/src/lay/lay/doc/images/drc_sized5.png b/src/doc/doc/images/drc_sized5.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized5.png
rename to src/doc/doc/images/drc_sized5.png
diff --git a/src/lay/lay/doc/images/drc_sized6.png b/src/doc/doc/images/drc_sized6.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_sized6.png
rename to src/doc/doc/images/drc_sized6.png
diff --git a/src/lay/lay/doc/images/drc_space1.png b/src/doc/doc/images/drc_space1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space1.png
rename to src/doc/doc/images/drc_space1.png
diff --git a/src/lay/lay/doc/images/drc_space1u.png b/src/doc/doc/images/drc_space1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space1u.png
rename to src/doc/doc/images/drc_space1u.png
diff --git a/src/lay/lay/doc/images/drc_space2.png b/src/doc/doc/images/drc_space2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space2.png
rename to src/doc/doc/images/drc_space2.png
diff --git a/src/lay/lay/doc/images/drc_space2u.png b/src/doc/doc/images/drc_space2u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space2u.png
rename to src/doc/doc/images/drc_space2u.png
diff --git a/src/lay/lay/doc/images/drc_space3.png b/src/doc/doc/images/drc_space3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space3.png
rename to src/doc/doc/images/drc_space3.png
diff --git a/src/lay/lay/doc/images/drc_space3u.png b/src/doc/doc/images/drc_space3u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_space3u.png
rename to src/doc/doc/images/drc_space3u.png
diff --git a/src/lay/lay/doc/images/drc_start_segments1.png b/src/doc/doc/images/drc_start_segments1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_start_segments1.png
rename to src/doc/doc/images/drc_start_segments1.png
diff --git a/src/lay/lay/doc/images/drc_start_segments2.png b/src/doc/doc/images/drc_start_segments2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_start_segments2.png
rename to src/doc/doc/images/drc_start_segments2.png
diff --git a/src/lay/lay/doc/images/drc_textpoly1.png b/src/doc/doc/images/drc_textpoly1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_textpoly1.png
rename to src/doc/doc/images/drc_textpoly1.png
diff --git a/src/lay/lay/doc/images/drc_textpoly2.png b/src/doc/doc/images/drc_textpoly2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_textpoly2.png
rename to src/doc/doc/images/drc_textpoly2.png
diff --git a/src/lay/lay/doc/images/drc_texts1.png b/src/doc/doc/images/drc_texts1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_texts1.png
rename to src/doc/doc/images/drc_texts1.png
diff --git a/src/lay/lay/doc/images/drc_texts2.png b/src/doc/doc/images/drc_texts2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_texts2.png
rename to src/doc/doc/images/drc_texts2.png
diff --git a/src/lay/lay/doc/images/drc_transformed1.png b/src/doc/doc/images/drc_transformed1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_transformed1.png
rename to src/doc/doc/images/drc_transformed1.png
diff --git a/src/lay/lay/doc/images/drc_width1.png b/src/doc/doc/images/drc_width1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width1.png
rename to src/doc/doc/images/drc_width1.png
diff --git a/src/lay/lay/doc/images/drc_width1u.png b/src/doc/doc/images/drc_width1u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width1u.png
rename to src/doc/doc/images/drc_width1u.png
diff --git a/src/lay/lay/doc/images/drc_width2.png b/src/doc/doc/images/drc_width2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width2.png
rename to src/doc/doc/images/drc_width2.png
diff --git a/src/lay/lay/doc/images/drc_width2u.png b/src/doc/doc/images/drc_width2u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width2u.png
rename to src/doc/doc/images/drc_width2u.png
diff --git a/src/lay/lay/doc/images/drc_width3.png b/src/doc/doc/images/drc_width3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width3.png
rename to src/doc/doc/images/drc_width3.png
diff --git a/src/lay/lay/doc/images/drc_width3u.png b/src/doc/doc/images/drc_width3u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width3u.png
rename to src/doc/doc/images/drc_width3u.png
diff --git a/src/lay/lay/doc/images/drc_width4.png b/src/doc/doc/images/drc_width4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width4.png
rename to src/doc/doc/images/drc_width4.png
diff --git a/src/lay/lay/doc/images/drc_width4u.png b/src/doc/doc/images/drc_width4u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width4u.png
rename to src/doc/doc/images/drc_width4u.png
diff --git a/src/lay/lay/doc/images/drc_width5u.png b/src/doc/doc/images/drc_width5u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width5u.png
rename to src/doc/doc/images/drc_width5u.png
diff --git a/src/lay/lay/doc/images/drc_width6u.png b/src/doc/doc/images/drc_width6u.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_width6u.png
rename to src/doc/doc/images/drc_width6u.png
diff --git a/src/lay/lay/doc/images/drc_with_angle1.png b/src/doc/doc/images/drc_with_angle1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_with_angle1.png
rename to src/doc/doc/images/drc_with_angle1.png
diff --git a/src/lay/lay/doc/images/drc_with_angle2.png b/src/doc/doc/images/drc_with_angle2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_with_angle2.png
rename to src/doc/doc/images/drc_with_angle2.png
diff --git a/src/lay/lay/doc/images/drc_with_angle3.png b/src/doc/doc/images/drc_with_angle3.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_with_angle3.png
rename to src/doc/doc/images/drc_with_angle3.png
diff --git a/src/lay/lay/doc/images/drc_with_angle4.png b/src/doc/doc/images/drc_with_angle4.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_with_angle4.png
rename to src/doc/doc/images/drc_with_angle4.png
diff --git a/src/lay/lay/doc/images/drc_xor1.png b/src/doc/doc/images/drc_xor1.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_xor1.png
rename to src/doc/doc/images/drc_xor1.png
diff --git a/src/lay/lay/doc/images/drc_xor2.png b/src/doc/doc/images/drc_xor2.png
similarity index 100%
rename from src/lay/lay/doc/images/drc_xor2.png
rename to src/doc/doc/images/drc_xor2.png
diff --git a/src/lay/lay/doc/manual/adjust_origin.xml b/src/doc/doc/manual/adjust_origin.xml
similarity index 100%
rename from src/lay/lay/doc/manual/adjust_origin.xml
rename to src/doc/doc/manual/adjust_origin.xml
diff --git a/src/lay/lay/doc/manual/advanced.xml b/src/doc/doc/manual/advanced.xml
similarity index 100%
rename from src/lay/lay/doc/manual/advanced.xml
rename to src/doc/doc/manual/advanced.xml
diff --git a/src/lay/lay/doc/manual/background_combination_modes.png b/src/doc/doc/manual/background_combination_modes.png
similarity index 100%
rename from src/lay/lay/doc/manual/background_combination_modes.png
rename to src/doc/doc/manual/background_combination_modes.png
diff --git a/src/lay/lay/doc/manual/background_modes.xml b/src/doc/doc/manual/background_modes.xml
similarity index 100%
rename from src/lay/lay/doc/manual/background_modes.xml
rename to src/doc/doc/manual/background_modes.xml
diff --git a/src/lay/lay/doc/manual/basic.xml b/src/doc/doc/manual/basic.xml
similarity index 100%
rename from src/lay/lay/doc/manual/basic.xml
rename to src/doc/doc/manual/basic.xml
diff --git a/src/lay/lay/doc/manual/bjt3_schematic.png b/src/doc/doc/manual/bjt3_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt3_schematic.png
rename to src/doc/doc/manual/bjt3_schematic.png
diff --git a/src/lay/lay/doc/manual/bjt4_schematic.png b/src/doc/doc/manual/bjt4_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt4_schematic.png
rename to src/doc/doc/manual/bjt4_schematic.png
diff --git a/src/lay/lay/doc/manual/bjt_ex_layout.png b/src/doc/doc/manual/bjt_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_ex_layout.png
rename to src/doc/doc/manual/bjt_ex_layout.png
diff --git a/src/lay/lay/doc/manual/bjt_ex_tb.png b/src/doc/doc/manual/bjt_ex_tb.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_ex_tb.png
rename to src/doc/doc/manual/bjt_ex_tb.png
diff --git a/src/lay/lay/doc/manual/bjt_ex_tc.png b/src/doc/doc/manual/bjt_ex_tc.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_ex_tc.png
rename to src/doc/doc/manual/bjt_ex_tc.png
diff --git a/src/lay/lay/doc/manual/bjt_ex_te.png b/src/doc/doc/manual/bjt_ex_te.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_ex_te.png
rename to src/doc/doc/manual/bjt_ex_te.png
diff --git a/src/lay/lay/doc/manual/bjt_ex_ts.png b/src/doc/doc/manual/bjt_ex_ts.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_ex_ts.png
rename to src/doc/doc/manual/bjt_ex_ts.png
diff --git a/src/lay/lay/doc/manual/bjt_lateral.png b/src/doc/doc/manual/bjt_lateral.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_lateral.png
rename to src/doc/doc/manual/bjt_lateral.png
diff --git a/src/lay/lay/doc/manual/bjt_vertical.png b/src/doc/doc/manual/bjt_vertical.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjt_vertical.png
rename to src/doc/doc/manual/bjt_vertical.png
diff --git a/src/lay/lay/doc/manual/bjtlat_ex_layout.png b/src/doc/doc/manual/bjtlat_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjtlat_ex_layout.png
rename to src/doc/doc/manual/bjtlat_ex_layout.png
diff --git a/src/lay/lay/doc/manual/bjtlat_ex_tb.png b/src/doc/doc/manual/bjtlat_ex_tb.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjtlat_ex_tb.png
rename to src/doc/doc/manual/bjtlat_ex_tb.png
diff --git a/src/lay/lay/doc/manual/bjtlat_ex_tc.png b/src/doc/doc/manual/bjtlat_ex_tc.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjtlat_ex_tc.png
rename to src/doc/doc/manual/bjtlat_ex_tc.png
diff --git a/src/lay/lay/doc/manual/bjtlat_ex_te.png b/src/doc/doc/manual/bjtlat_ex_te.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjtlat_ex_te.png
rename to src/doc/doc/manual/bjtlat_ex_te.png
diff --git a/src/lay/lay/doc/manual/bjtlat_ex_ts.png b/src/doc/doc/manual/bjtlat_ex_ts.png
similarity index 100%
rename from src/lay/lay/doc/manual/bjtlat_ex_ts.png
rename to src/doc/doc/manual/bjtlat_ex_ts.png
diff --git a/src/lay/lay/doc/manual/bookmarks.xml b/src/doc/doc/manual/bookmarks.xml
similarity index 100%
rename from src/lay/lay/doc/manual/bookmarks.xml
rename to src/doc/doc/manual/bookmarks.xml
diff --git a/src/lay/lay/doc/manual/browse_instances.xml b/src/doc/doc/manual/browse_instances.xml
similarity index 100%
rename from src/lay/lay/doc/manual/browse_instances.xml
rename to src/doc/doc/manual/browse_instances.xml
diff --git a/src/lay/lay/doc/manual/browse_shapes.xml b/src/doc/doc/manual/browse_shapes.xml
similarity index 100%
rename from src/lay/lay/doc/manual/browse_shapes.xml
rename to src/doc/doc/manual/browse_shapes.xml
diff --git a/src/lay/lay/doc/manual/cap_ex_layout.png b/src/doc/doc/manual/cap_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_ex_layout.png
rename to src/doc/doc/manual/cap_ex_layout.png
diff --git a/src/lay/lay/doc/manual/cap_ex_ta.png b/src/doc/doc/manual/cap_ex_ta.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_ex_ta.png
rename to src/doc/doc/manual/cap_ex_ta.png
diff --git a/src/lay/lay/doc/manual/cap_ex_tb.png b/src/doc/doc/manual/cap_ex_tb.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_ex_tb.png
rename to src/doc/doc/manual/cap_ex_tb.png
diff --git a/src/lay/lay/doc/manual/cap_ex_tw.png b/src/doc/doc/manual/cap_ex_tw.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_ex_tw.png
rename to src/doc/doc/manual/cap_ex_tw.png
diff --git a/src/lay/lay/doc/manual/cap_schematic.png b/src/doc/doc/manual/cap_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_schematic.png
rename to src/doc/doc/manual/cap_schematic.png
diff --git a/src/lay/lay/doc/manual/cap_with_bulk_schematic.png b/src/doc/doc/manual/cap_with_bulk_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/cap_with_bulk_schematic.png
rename to src/doc/doc/manual/cap_with_bulk_schematic.png
diff --git a/src/lay/lay/doc/manual/cell.xml b/src/doc/doc/manual/cell.xml
similarity index 100%
rename from src/lay/lay/doc/manual/cell.xml
rename to src/doc/doc/manual/cell.xml
diff --git a/src/lay/lay/doc/manual/cell_list.xml b/src/doc/doc/manual/cell_list.xml
similarity index 100%
rename from src/lay/lay/doc/manual/cell_list.xml
rename to src/doc/doc/manual/cell_list.xml
diff --git a/src/lay/lay/doc/manual/clip.xml b/src/doc/doc/manual/clip.xml
similarity index 100%
rename from src/lay/lay/doc/manual/clip.xml
rename to src/doc/doc/manual/clip.xml
diff --git a/src/lay/lay/doc/manual/copypaste_cell.xml b/src/doc/doc/manual/copypaste_cell.xml
similarity index 100%
rename from src/lay/lay/doc/manual/copypaste_cell.xml
rename to src/doc/doc/manual/copypaste_cell.xml
diff --git a/src/lay/lay/doc/manual/copypaste_sel.xml b/src/doc/doc/manual/copypaste_sel.xml
similarity index 100%
rename from src/lay/lay/doc/manual/copypaste_sel.xml
rename to src/doc/doc/manual/copypaste_sel.xml
diff --git a/src/lay/lay/doc/manual/create_box.xml b/src/doc/doc/manual/create_box.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_box.xml
rename to src/doc/doc/manual/create_box.xml
diff --git a/src/lay/lay/doc/manual/create_cells.xml b/src/doc/doc/manual/create_cells.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_cells.xml
rename to src/doc/doc/manual/create_cells.xml
diff --git a/src/lay/lay/doc/manual/create_cv1.png b/src/doc/doc/manual/create_cv1.png
similarity index 100%
rename from src/lay/lay/doc/manual/create_cv1.png
rename to src/doc/doc/manual/create_cv1.png
diff --git a/src/lay/lay/doc/manual/create_cv2.png b/src/doc/doc/manual/create_cv2.png
similarity index 100%
rename from src/lay/lay/doc/manual/create_cv2.png
rename to src/doc/doc/manual/create_cv2.png
diff --git a/src/lay/lay/doc/manual/create_cv3.png b/src/doc/doc/manual/create_cv3.png
similarity index 100%
rename from src/lay/lay/doc/manual/create_cv3.png
rename to src/doc/doc/manual/create_cv3.png
diff --git a/src/lay/lay/doc/manual/create_cv4.png b/src/doc/doc/manual/create_cv4.png
similarity index 100%
rename from src/lay/lay/doc/manual/create_cv4.png
rename to src/doc/doc/manual/create_cv4.png
diff --git a/src/lay/lay/doc/manual/create_from_scratch.xml b/src/doc/doc/manual/create_from_scratch.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_from_scratch.xml
rename to src/doc/doc/manual/create_from_scratch.xml
diff --git a/src/lay/lay/doc/manual/create_instance.xml b/src/doc/doc/manual/create_instance.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_instance.xml
rename to src/doc/doc/manual/create_instance.xml
diff --git a/src/lay/lay/doc/manual/create_layers.xml b/src/doc/doc/manual/create_layers.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_layers.xml
rename to src/doc/doc/manual/create_layers.xml
diff --git a/src/lay/lay/doc/manual/create_path.xml b/src/doc/doc/manual/create_path.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_path.xml
rename to src/doc/doc/manual/create_path.xml
diff --git a/src/lay/lay/doc/manual/create_polygon.xml b/src/doc/doc/manual/create_polygon.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_polygon.xml
rename to src/doc/doc/manual/create_polygon.xml
diff --git a/src/lay/lay/doc/manual/create_text.xml b/src/doc/doc/manual/create_text.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_text.xml
rename to src/doc/doc/manual/create_text.xml
diff --git a/src/lay/lay/doc/manual/create_variants.xml b/src/doc/doc/manual/create_variants.xml
similarity index 100%
rename from src/lay/lay/doc/manual/create_variants.xml
rename to src/doc/doc/manual/create_variants.xml
diff --git a/src/lay/lay/doc/manual/del_cell.xml b/src/doc/doc/manual/del_cell.xml
similarity index 100%
rename from src/lay/lay/doc/manual/del_cell.xml
rename to src/doc/doc/manual/del_cell.xml
diff --git a/src/lay/lay/doc/manual/descend.xml b/src/doc/doc/manual/descend.xml
similarity index 100%
rename from src/lay/lay/doc/manual/descend.xml
rename to src/doc/doc/manual/descend.xml
diff --git a/src/lay/lay/doc/manual/diff.xml b/src/doc/doc/manual/diff.xml
similarity index 100%
rename from src/lay/lay/doc/manual/diff.xml
rename to src/doc/doc/manual/diff.xml
diff --git a/src/lay/lay/doc/manual/diode_ex_layout.png b/src/doc/doc/manual/diode_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/diode_ex_layout.png
rename to src/doc/doc/manual/diode_ex_layout.png
diff --git a/src/lay/lay/doc/manual/diode_ex_ta.png b/src/doc/doc/manual/diode_ex_ta.png
similarity index 100%
rename from src/lay/lay/doc/manual/diode_ex_ta.png
rename to src/doc/doc/manual/diode_ex_ta.png
diff --git a/src/lay/lay/doc/manual/diode_ex_tc.png b/src/doc/doc/manual/diode_ex_tc.png
similarity index 100%
rename from src/lay/lay/doc/manual/diode_ex_tc.png
rename to src/doc/doc/manual/diode_ex_tc.png
diff --git a/src/lay/lay/doc/manual/diode_schematic.png b/src/doc/doc/manual/diode_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/diode_schematic.png
rename to src/doc/doc/manual/diode_schematic.png
diff --git a/src/lay/lay/doc/manual/drc.xml b/src/doc/doc/manual/drc.xml
similarity index 100%
rename from src/lay/lay/doc/manual/drc.xml
rename to src/doc/doc/manual/drc.xml
diff --git a/src/lay/lay/doc/manual/drc_basic.xml b/src/doc/doc/manual/drc_basic.xml
similarity index 100%
rename from src/lay/lay/doc/manual/drc_basic.xml
rename to src/doc/doc/manual/drc_basic.xml
diff --git a/src/lay/lay/doc/manual/drc_runsets.xml b/src/doc/doc/manual/drc_runsets.xml
similarity index 100%
rename from src/lay/lay/doc/manual/drc_runsets.xml
rename to src/doc/doc/manual/drc_runsets.xml
diff --git a/src/lay/lay/doc/manual/edit_mode.xml b/src/doc/doc/manual/edit_mode.xml
similarity index 100%
rename from src/lay/lay/doc/manual/edit_mode.xml
rename to src/doc/doc/manual/edit_mode.xml
diff --git a/src/lay/lay/doc/manual/editor.xml b/src/doc/doc/manual/editor.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor.xml
rename to src/doc/doc/manual/editor.xml
diff --git a/src/lay/lay/doc/manual/editor_advanced.xml b/src/doc/doc/manual/editor_advanced.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor_advanced.xml
rename to src/doc/doc/manual/editor_advanced.xml
diff --git a/src/lay/lay/doc/manual/editor_basics.xml b/src/doc/doc/manual/editor_basics.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor_basics.xml
rename to src/doc/doc/manual/editor_basics.xml
diff --git a/src/lay/lay/doc/manual/editor_operations.xml b/src/doc/doc/manual/editor_operations.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor_operations.xml
rename to src/doc/doc/manual/editor_operations.xml
diff --git a/src/lay/lay/doc/manual/editor_options.xml b/src/doc/doc/manual/editor_options.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor_options.xml
rename to src/doc/doc/manual/editor_options.xml
diff --git a/src/lay/lay/doc/manual/editor_selection.xml b/src/doc/doc/manual/editor_selection.xml
similarity index 100%
rename from src/lay/lay/doc/manual/editor_selection.xml
rename to src/doc/doc/manual/editor_selection.xml
diff --git a/src/lay/lay/doc/manual/explicit_hier_levels.xml b/src/doc/doc/manual/explicit_hier_levels.xml
similarity index 100%
rename from src/lay/lay/doc/manual/explicit_hier_levels.xml
rename to src/doc/doc/manual/explicit_hier_levels.xml
diff --git a/src/lay/lay/doc/manual/fill_default.png b/src/doc/doc/manual/fill_default.png
similarity index 100%
rename from src/lay/lay/doc/manual/fill_default.png
rename to src/doc/doc/manual/fill_default.png
diff --git a/src/lay/lay/doc/manual/fill_enhanced.png b/src/doc/doc/manual/fill_enhanced.png
similarity index 100%
rename from src/lay/lay/doc/manual/fill_enhanced.png
rename to src/doc/doc/manual/fill_enhanced.png
diff --git a/src/lay/lay/doc/manual/fill_second_order.png b/src/doc/doc/manual/fill_second_order.png
similarity index 100%
rename from src/lay/lay/doc/manual/fill_second_order.png
rename to src/doc/doc/manual/fill_second_order.png
diff --git a/src/lay/lay/doc/manual/flatten.xml b/src/doc/doc/manual/flatten.xml
similarity index 100%
rename from src/lay/lay/doc/manual/flatten.xml
rename to src/doc/doc/manual/flatten.xml
diff --git a/src/lay/lay/doc/manual/global_trans.xml b/src/doc/doc/manual/global_trans.xml
similarity index 100%
rename from src/lay/lay/doc/manual/global_trans.xml
rename to src/doc/doc/manual/global_trans.xml
diff --git a/src/lay/lay/doc/manual/hiding.xml b/src/doc/doc/manual/hiding.xml
similarity index 100%
rename from src/lay/lay/doc/manual/hiding.xml
rename to src/doc/doc/manual/hiding.xml
diff --git a/src/lay/lay/doc/manual/hier.xml b/src/doc/doc/manual/hier.xml
similarity index 100%
rename from src/lay/lay/doc/manual/hier.xml
rename to src/doc/doc/manual/hier.xml
diff --git a/src/lay/lay/doc/manual/hier_ops.xml b/src/doc/doc/manual/hier_ops.xml
similarity index 100%
rename from src/lay/lay/doc/manual/hier_ops.xml
rename to src/doc/doc/manual/hier_ops.xml
diff --git a/src/lay/lay/doc/manual/hierarchy_panel.png b/src/doc/doc/manual/hierarchy_panel.png
similarity index 100%
rename from src/lay/lay/doc/manual/hierarchy_panel.png
rename to src/doc/doc/manual/hierarchy_panel.png
diff --git a/src/lay/lay/doc/manual/images.xml b/src/doc/doc/manual/images.xml
similarity index 100%
rename from src/lay/lay/doc/manual/images.xml
rename to src/doc/doc/manual/images.xml
diff --git a/src/lay/lay/doc/manual/import_gerber.xml b/src/doc/doc/manual/import_gerber.xml
similarity index 100%
rename from src/lay/lay/doc/manual/import_gerber.xml
rename to src/doc/doc/manual/import_gerber.xml
diff --git a/src/lay/lay/doc/manual/import_layout.xml b/src/doc/doc/manual/import_layout.xml
similarity index 100%
rename from src/lay/lay/doc/manual/import_layout.xml
rename to src/doc/doc/manual/import_layout.xml
diff --git a/src/lay/lay/doc/manual/index.xml b/src/doc/doc/manual/index.xml
similarity index 100%
rename from src/lay/lay/doc/manual/index.xml
rename to src/doc/doc/manual/index.xml
diff --git a/src/lay/lay/doc/manual/inv.png b/src/doc/doc/manual/inv.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv.png
rename to src/doc/doc/manual/inv.png
diff --git a/src/lay/lay/doc/manual/inv_explicit.png b/src/doc/doc/manual/inv_explicit.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_explicit.png
rename to src/doc/doc/manual/inv_explicit.png
diff --git a/src/lay/lay/doc/manual/inv_no_transistors.png b/src/doc/doc/manual/inv_no_transistors.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_no_transistors.png
rename to src/doc/doc/manual/inv_no_transistors.png
diff --git a/src/lay/lay/doc/manual/inv_schematic.png b/src/doc/doc/manual/inv_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_schematic.png
rename to src/doc/doc/manual/inv_schematic.png
diff --git a/src/lay/lay/doc/manual/inv_schematic2.png b/src/doc/doc/manual/inv_schematic2.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_schematic2.png
rename to src/doc/doc/manual/inv_schematic2.png
diff --git a/src/lay/lay/doc/manual/inv_transistors.png b/src/doc/doc/manual/inv_transistors.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_transistors.png
rename to src/doc/doc/manual/inv_transistors.png
diff --git a/src/lay/lay/doc/manual/inv_with_diodes.png b/src/doc/doc/manual/inv_with_diodes.png
similarity index 100%
rename from src/lay/lay/doc/manual/inv_with_diodes.png
rename to src/doc/doc/manual/inv_with_diodes.png
diff --git a/src/lay/lay/doc/manual/landmarks.xml b/src/doc/doc/manual/landmarks.xml
similarity index 100%
rename from src/lay/lay/doc/manual/landmarks.xml
rename to src/doc/doc/manual/landmarks.xml
diff --git a/src/lay/lay/doc/manual/layer_animation.xml b/src/doc/doc/manual/layer_animation.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_animation.xml
rename to src/doc/doc/manual/layer_animation.xml
diff --git a/src/lay/lay/doc/manual/layer_boolean.xml b/src/doc/doc/manual/layer_boolean.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_boolean.xml
rename to src/doc/doc/manual/layer_boolean.xml
diff --git a/src/lay/lay/doc/manual/layer_color.xml b/src/doc/doc/manual/layer_color.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_color.xml
rename to src/doc/doc/manual/layer_color.xml
diff --git a/src/lay/lay/doc/manual/layer_content.xml b/src/doc/doc/manual/layer_content.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_content.xml
rename to src/doc/doc/manual/layer_content.xml
diff --git a/src/lay/lay/doc/manual/layer_fill.xml b/src/doc/doc/manual/layer_fill.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_fill.xml
rename to src/doc/doc/manual/layer_fill.xml
diff --git a/src/lay/lay/doc/manual/layer_hier.xml b/src/doc/doc/manual/layer_hier.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_hier.xml
rename to src/doc/doc/manual/layer_hier.xml
diff --git a/src/lay/lay/doc/manual/layer_ops.xml b/src/doc/doc/manual/layer_ops.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_ops.xml
rename to src/doc/doc/manual/layer_ops.xml
diff --git a/src/lay/lay/doc/manual/layer_order.xml b/src/doc/doc/manual/layer_order.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_order.xml
rename to src/doc/doc/manual/layer_order.xml
diff --git a/src/lay/lay/doc/manual/layer_size.xml b/src/doc/doc/manual/layer_size.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_size.xml
rename to src/doc/doc/manual/layer_size.xml
diff --git a/src/lay/lay/doc/manual/layer_source.xml b/src/doc/doc/manual/layer_source.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_source.xml
rename to src/doc/doc/manual/layer_source.xml
diff --git a/src/lay/lay/doc/manual/layer_source_expert.xml b/src/doc/doc/manual/layer_source_expert.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_source_expert.xml
rename to src/doc/doc/manual/layer_source_expert.xml
diff --git a/src/lay/lay/doc/manual/layer_style.xml b/src/doc/doc/manual/layer_style.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_style.xml
rename to src/doc/doc/manual/layer_style.xml
diff --git a/src/lay/lay/doc/manual/layer_tabs.xml b/src/doc/doc/manual/layer_tabs.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_tabs.xml
rename to src/doc/doc/manual/layer_tabs.xml
diff --git a/src/lay/lay/doc/manual/layer_validity.xml b/src/doc/doc/manual/layer_validity.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_validity.xml
rename to src/doc/doc/manual/layer_validity.xml
diff --git a/src/lay/lay/doc/manual/layer_views.xml b/src/doc/doc/manual/layer_views.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_views.xml
rename to src/doc/doc/manual/layer_views.xml
diff --git a/src/lay/lay/doc/manual/layer_visibility.xml b/src/doc/doc/manual/layer_visibility.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layer_visibility.xml
rename to src/doc/doc/manual/layer_visibility.xml
diff --git a/src/lay/lay/doc/manual/layout_transforms.xml b/src/doc/doc/manual/layout_transforms.xml
similarity index 100%
rename from src/lay/lay/doc/manual/layout_transforms.xml
rename to src/doc/doc/manual/layout_transforms.xml
diff --git a/src/lay/lay/doc/manual/library_view.png b/src/doc/doc/manual/library_view.png
similarity index 100%
rename from src/lay/lay/doc/manual/library_view.png
rename to src/doc/doc/manual/library_view.png
diff --git a/src/lay/lay/doc/manual/library_view.xml b/src/doc/doc/manual/library_view.xml
similarity index 100%
rename from src/lay/lay/doc/manual/library_view.xml
rename to src/doc/doc/manual/library_view.xml
diff --git a/src/lay/lay/doc/manual/line_style.xml b/src/doc/doc/manual/line_style.xml
similarity index 100%
rename from src/lay/lay/doc/manual/line_style.xml
rename to src/doc/doc/manual/line_style.xml
diff --git a/src/lay/lay/doc/manual/load_save_layers.xml b/src/doc/doc/manual/load_save_layers.xml
similarity index 100%
rename from src/lay/lay/doc/manual/load_save_layers.xml
rename to src/doc/doc/manual/load_save_layers.xml
diff --git a/src/lay/lay/doc/manual/loading.xml b/src/doc/doc/manual/loading.xml
similarity index 100%
rename from src/lay/lay/doc/manual/loading.xml
rename to src/doc/doc/manual/loading.xml
diff --git a/src/lay/lay/doc/manual/lvs.xml b/src/doc/doc/manual/lvs.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs.xml
rename to src/doc/doc/manual/lvs.xml
diff --git a/src/lay/lay/doc/manual/lvs_browser.png b/src/doc/doc/manual/lvs_browser.png
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_browser.png
rename to src/doc/doc/manual/lvs_browser.png
diff --git a/src/lay/lay/doc/manual/lvs_compare.xml b/src/doc/doc/manual/lvs_compare.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_compare.xml
rename to src/doc/doc/manual/lvs_compare.xml
diff --git a/src/lay/lay/doc/manual/lvs_connect.xml b/src/doc/doc/manual/lvs_connect.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_connect.xml
rename to src/doc/doc/manual/lvs_connect.xml
diff --git a/src/lay/lay/doc/manual/lvs_device_classes.xml b/src/doc/doc/manual/lvs_device_classes.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_device_classes.xml
rename to src/doc/doc/manual/lvs_device_classes.xml
diff --git a/src/lay/lay/doc/manual/lvs_device_extractors.xml b/src/doc/doc/manual/lvs_device_extractors.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_device_extractors.xml
rename to src/doc/doc/manual/lvs_device_extractors.xml
diff --git a/src/lay/lay/doc/manual/lvs_devices.xml b/src/doc/doc/manual/lvs_devices.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_devices.xml
rename to src/doc/doc/manual/lvs_devices.xml
diff --git a/src/lay/lay/doc/manual/lvs_intro.xml b/src/doc/doc/manual/lvs_intro.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_intro.xml
rename to src/doc/doc/manual/lvs_intro.xml
diff --git a/src/lay/lay/doc/manual/lvs_io.xml b/src/doc/doc/manual/lvs_io.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_io.xml
rename to src/doc/doc/manual/lvs_io.xml
diff --git a/src/lay/lay/doc/manual/lvs_overview.xml b/src/doc/doc/manual/lvs_overview.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_overview.xml
rename to src/doc/doc/manual/lvs_overview.xml
diff --git a/src/lay/lay/doc/manual/lvs_symm_nodes.png b/src/doc/doc/manual/lvs_symm_nodes.png
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_symm_nodes.png
rename to src/doc/doc/manual/lvs_symm_nodes.png
diff --git a/src/lay/lay/doc/manual/lvs_tweaks.xml b/src/doc/doc/manual/lvs_tweaks.xml
similarity index 100%
rename from src/lay/lay/doc/manual/lvs_tweaks.xml
rename to src/doc/doc/manual/lvs_tweaks.xml
diff --git a/src/lay/lay/doc/manual/main_window.png b/src/doc/doc/manual/main_window.png
similarity index 100%
rename from src/lay/lay/doc/manual/main_window.png
rename to src/doc/doc/manual/main_window.png
diff --git a/src/lay/lay/doc/manual/main_window.xml b/src/doc/doc/manual/main_window.xml
similarity index 100%
rename from src/lay/lay/doc/manual/main_window.xml
rename to src/doc/doc/manual/main_window.xml
diff --git a/src/lay/lay/doc/manual/main_window_org.png b/src/doc/doc/manual/main_window_org.png
similarity index 100%
rename from src/lay/lay/doc/manual/main_window_org.png
rename to src/doc/doc/manual/main_window_org.png
diff --git a/src/lay/lay/doc/manual/marker_browser.xml b/src/doc/doc/manual/marker_browser.xml
similarity index 100%
rename from src/lay/lay/doc/manual/marker_browser.xml
rename to src/doc/doc/manual/marker_browser.xml
diff --git a/src/lay/lay/doc/manual/max_coherence.png b/src/doc/doc/manual/max_coherence.png
similarity index 100%
rename from src/lay/lay/doc/manual/max_coherence.png
rename to src/doc/doc/manual/max_coherence.png
diff --git a/src/lay/lay/doc/manual/measure.xml b/src/doc/doc/manual/measure.xml
similarity index 100%
rename from src/lay/lay/doc/manual/measure.xml
rename to src/doc/doc/manual/measure.xml
diff --git a/src/lay/lay/doc/manual/metal_connections.png b/src/doc/doc/manual/metal_connections.png
similarity index 100%
rename from src/lay/lay/doc/manual/metal_connections.png
rename to src/doc/doc/manual/metal_connections.png
diff --git a/src/lay/lay/doc/manual/min_coherence.png b/src/doc/doc/manual/min_coherence.png
similarity index 100%
rename from src/lay/lay/doc/manual/min_coherence.png
rename to src/doc/doc/manual/min_coherence.png
diff --git a/src/lay/lay/doc/manual/mos3_schematic.png b/src/doc/doc/manual/mos3_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos3_schematic.png
rename to src/doc/doc/manual/mos3_schematic.png
diff --git a/src/lay/lay/doc/manual/mos4_schematic.png b/src/doc/doc/manual/mos4_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos4_schematic.png
rename to src/doc/doc/manual/mos4_schematic.png
diff --git a/src/lay/lay/doc/manual/mos_ex_layout.png b/src/doc/doc/manual/mos_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos_ex_layout.png
rename to src/doc/doc/manual/mos_ex_layout.png
diff --git a/src/lay/lay/doc/manual/mos_ex_tb.png b/src/doc/doc/manual/mos_ex_tb.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos_ex_tb.png
rename to src/doc/doc/manual/mos_ex_tb.png
diff --git a/src/lay/lay/doc/manual/mos_ex_td.png b/src/doc/doc/manual/mos_ex_td.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos_ex_td.png
rename to src/doc/doc/manual/mos_ex_td.png
diff --git a/src/lay/lay/doc/manual/mos_ex_tg.png b/src/doc/doc/manual/mos_ex_tg.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos_ex_tg.png
rename to src/doc/doc/manual/mos_ex_tg.png
diff --git a/src/lay/lay/doc/manual/mos_ex_ts.png b/src/doc/doc/manual/mos_ex_ts.png
similarity index 100%
rename from src/lay/lay/doc/manual/mos_ex_ts.png
rename to src/doc/doc/manual/mos_ex_ts.png
diff --git a/src/lay/lay/doc/manual/move_layer_sel.xml b/src/doc/doc/manual/move_layer_sel.xml
similarity index 100%
rename from src/lay/lay/doc/manual/move_layer_sel.xml
rename to src/doc/doc/manual/move_layer_sel.xml
diff --git a/src/lay/lay/doc/manual/move_sel.xml b/src/doc/doc/manual/move_sel.xml
similarity index 100%
rename from src/lay/lay/doc/manual/move_sel.xml
rename to src/doc/doc/manual/move_sel.xml
diff --git a/src/lay/lay/doc/manual/navigator.png b/src/doc/doc/manual/navigator.png
similarity index 100%
rename from src/lay/lay/doc/manual/navigator.png
rename to src/doc/doc/manual/navigator.png
diff --git a/src/lay/lay/doc/manual/net_graph.png b/src/doc/doc/manual/net_graph.png
similarity index 100%
rename from src/lay/lay/doc/manual/net_graph.png
rename to src/doc/doc/manual/net_graph.png
diff --git a/src/lay/lay/doc/manual/net_tracing.xml b/src/doc/doc/manual/net_tracing.xml
similarity index 100%
rename from src/lay/lay/doc/manual/net_tracing.xml
rename to src/doc/doc/manual/net_tracing.xml
diff --git a/src/lay/lay/doc/manual/object_align.xml b/src/doc/doc/manual/object_align.xml
similarity index 100%
rename from src/lay/lay/doc/manual/object_align.xml
rename to src/doc/doc/manual/object_align.xml
diff --git a/src/lay/lay/doc/manual/panels.xml b/src/doc/doc/manual/panels.xml
similarity index 100%
rename from src/lay/lay/doc/manual/panels.xml
rename to src/doc/doc/manual/panels.xml
diff --git a/src/lay/lay/doc/manual/partial.xml b/src/doc/doc/manual/partial.xml
similarity index 100%
rename from src/lay/lay/doc/manual/partial.xml
rename to src/doc/doc/manual/partial.xml
diff --git a/src/lay/lay/doc/manual/partial_vs_full.xml b/src/doc/doc/manual/partial_vs_full.xml
similarity index 100%
rename from src/lay/lay/doc/manual/partial_vs_full.xml
rename to src/doc/doc/manual/partial_vs_full.xml
diff --git a/src/lay/lay/doc/manual/pcb_1x.png b/src/doc/doc/manual/pcb_1x.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_1x.png
rename to src/doc/doc/manual/pcb_1x.png
diff --git a/src/lay/lay/doc/manual/pcb_2x.png b/src/doc/doc/manual/pcb_2x.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_2x.png
rename to src/doc/doc/manual/pcb_2x.png
diff --git a/src/lay/lay/doc/manual/pcb_3x.png b/src/doc/doc/manual/pcb_3x.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_3x.png
rename to src/doc/doc/manual/pcb_3x.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_1.png b/src/doc/doc/manual/pcb_import_free_flow_1.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_1.png
rename to src/doc/doc/manual/pcb_import_free_flow_1.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_2.png b/src/doc/doc/manual/pcb_import_free_flow_2.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_2.png
rename to src/doc/doc/manual/pcb_import_free_flow_2.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_3.png b/src/doc/doc/manual/pcb_import_free_flow_3.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_3.png
rename to src/doc/doc/manual/pcb_import_free_flow_3.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_4.png b/src/doc/doc/manual/pcb_import_free_flow_4.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_4.png
rename to src/doc/doc/manual/pcb_import_free_flow_4.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_5.png b/src/doc/doc/manual/pcb_import_free_flow_5.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_5.png
rename to src/doc/doc/manual/pcb_import_free_flow_5.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_6.png b/src/doc/doc/manual/pcb_import_free_flow_6.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_6.png
rename to src/doc/doc/manual/pcb_import_free_flow_6.png
diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_7.png b/src/doc/doc/manual/pcb_import_free_flow_7.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_free_flow_7.png
rename to src/doc/doc/manual/pcb_import_free_flow_7.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_1.png b/src/doc/doc/manual/pcb_import_stack_flow_1.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_1.png
rename to src/doc/doc/manual/pcb_import_stack_flow_1.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_2.png b/src/doc/doc/manual/pcb_import_stack_flow_2.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_2.png
rename to src/doc/doc/manual/pcb_import_stack_flow_2.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_3.png b/src/doc/doc/manual/pcb_import_stack_flow_3.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_3.png
rename to src/doc/doc/manual/pcb_import_stack_flow_3.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_4.png b/src/doc/doc/manual/pcb_import_stack_flow_4.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_4.png
rename to src/doc/doc/manual/pcb_import_stack_flow_4.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_5.png b/src/doc/doc/manual/pcb_import_stack_flow_5.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_5.png
rename to src/doc/doc/manual/pcb_import_stack_flow_5.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_6.png b/src/doc/doc/manual/pcb_import_stack_flow_6.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_6.png
rename to src/doc/doc/manual/pcb_import_stack_flow_6.png
diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_7.png b/src/doc/doc/manual/pcb_import_stack_flow_7.png
similarity index 100%
rename from src/lay/lay/doc/manual/pcb_import_stack_flow_7.png
rename to src/doc/doc/manual/pcb_import_stack_flow_7.png
diff --git a/src/lay/lay/doc/manual/pcell_operations.xml b/src/doc/doc/manual/pcell_operations.xml
similarity index 100%
rename from src/lay/lay/doc/manual/pcell_operations.xml
rename to src/doc/doc/manual/pcell_operations.xml
diff --git a/src/lay/lay/doc/manual/pick_and_drop.xml b/src/doc/doc/manual/pick_and_drop.xml
similarity index 100%
rename from src/lay/lay/doc/manual/pick_and_drop.xml
rename to src/doc/doc/manual/pick_and_drop.xml
diff --git a/src/lay/lay/doc/manual/rename_cell.xml b/src/doc/doc/manual/rename_cell.xml
similarity index 100%
rename from src/lay/lay/doc/manual/rename_cell.xml
rename to src/doc/doc/manual/rename_cell.xml
diff --git a/src/lay/lay/doc/manual/res_ex_layout.png b/src/doc/doc/manual/res_ex_layout.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_ex_layout.png
rename to src/doc/doc/manual/res_ex_layout.png
diff --git a/src/lay/lay/doc/manual/res_ex_ta.png b/src/doc/doc/manual/res_ex_ta.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_ex_ta.png
rename to src/doc/doc/manual/res_ex_ta.png
diff --git a/src/lay/lay/doc/manual/res_ex_tb.png b/src/doc/doc/manual/res_ex_tb.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_ex_tb.png
rename to src/doc/doc/manual/res_ex_tb.png
diff --git a/src/lay/lay/doc/manual/res_ex_tw.png b/src/doc/doc/manual/res_ex_tw.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_ex_tw.png
rename to src/doc/doc/manual/res_ex_tw.png
diff --git a/src/lay/lay/doc/manual/res_schematic.png b/src/doc/doc/manual/res_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_schematic.png
rename to src/doc/doc/manual/res_schematic.png
diff --git a/src/lay/lay/doc/manual/res_with_bulk_schematic.png b/src/doc/doc/manual/res_with_bulk_schematic.png
similarity index 100%
rename from src/lay/lay/doc/manual/res_with_bulk_schematic.png
rename to src/doc/doc/manual/res_with_bulk_schematic.png
diff --git a/src/lay/lay/doc/manual/resolve_arrays.xml b/src/doc/doc/manual/resolve_arrays.xml
similarity index 100%
rename from src/lay/lay/doc/manual/resolve_arrays.xml
rename to src/doc/doc/manual/resolve_arrays.xml
diff --git a/src/lay/lay/doc/manual/round_corners.png b/src/doc/doc/manual/round_corners.png
similarity index 100%
rename from src/lay/lay/doc/manual/round_corners.png
rename to src/doc/doc/manual/round_corners.png
diff --git a/src/lay/lay/doc/manual/round_corners.xml b/src/doc/doc/manual/round_corners.xml
similarity index 100%
rename from src/lay/lay/doc/manual/round_corners.xml
rename to src/doc/doc/manual/round_corners.xml
diff --git a/src/lay/lay/doc/manual/ruler_properties.xml b/src/doc/doc/manual/ruler_properties.xml
similarity index 100%
rename from src/lay/lay/doc/manual/ruler_properties.xml
rename to src/doc/doc/manual/ruler_properties.xml
diff --git a/src/lay/lay/doc/manual/save.xml b/src/doc/doc/manual/save.xml
similarity index 100%
rename from src/lay/lay/doc/manual/save.xml
rename to src/doc/doc/manual/save.xml
diff --git a/src/lay/lay/doc/manual/screenshots.xml b/src/doc/doc/manual/screenshots.xml
similarity index 100%
rename from src/lay/lay/doc/manual/screenshots.xml
rename to src/doc/doc/manual/screenshots.xml
diff --git a/src/lay/lay/doc/manual/search_replace.xml b/src/doc/doc/manual/search_replace.xml
similarity index 100%
rename from src/lay/lay/doc/manual/search_replace.xml
rename to src/doc/doc/manual/search_replace.xml
diff --git a/src/lay/lay/doc/manual/selecting.xml b/src/doc/doc/manual/selecting.xml
similarity index 100%
rename from src/lay/lay/doc/manual/selecting.xml
rename to src/doc/doc/manual/selecting.xml
diff --git a/src/lay/lay/doc/manual/session.xml b/src/doc/doc/manual/session.xml
similarity index 100%
rename from src/lay/lay/doc/manual/session.xml
rename to src/doc/doc/manual/session.xml
diff --git a/src/lay/lay/doc/manual/setup.xml b/src/doc/doc/manual/setup.xml
similarity index 100%
rename from src/lay/lay/doc/manual/setup.xml
rename to src/doc/doc/manual/setup.xml
diff --git a/src/lay/lay/doc/manual/shape_boolean.xml b/src/doc/doc/manual/shape_boolean.xml
similarity index 100%
rename from src/lay/lay/doc/manual/shape_boolean.xml
rename to src/doc/doc/manual/shape_boolean.xml
diff --git a/src/lay/lay/doc/manual/shape_size.xml b/src/doc/doc/manual/shape_size.xml
similarity index 100%
rename from src/lay/lay/doc/manual/shape_size.xml
rename to src/doc/doc/manual/shape_size.xml
diff --git a/src/lay/lay/doc/manual/size_modes.png b/src/doc/doc/manual/size_modes.png
similarity index 100%
rename from src/lay/lay/doc/manual/size_modes.png
rename to src/doc/doc/manual/size_modes.png
diff --git a/src/lay/lay/doc/manual/substrate_connections.png b/src/doc/doc/manual/substrate_connections.png
similarity index 100%
rename from src/lay/lay/doc/manual/substrate_connections.png
rename to src/doc/doc/manual/substrate_connections.png
diff --git a/src/lay/lay/doc/manual/symm_nodes.png b/src/doc/doc/manual/symm_nodes.png
similarity index 100%
rename from src/lay/lay/doc/manual/symm_nodes.png
rename to src/doc/doc/manual/symm_nodes.png
diff --git a/src/lay/lay/doc/manual/technology_manager.xml b/src/doc/doc/manual/technology_manager.xml
similarity index 100%
rename from src/lay/lay/doc/manual/technology_manager.xml
rename to src/doc/doc/manual/technology_manager.xml
diff --git a/src/lay/lay/doc/manual/tiling.xml b/src/doc/doc/manual/tiling.xml
similarity index 100%
rename from src/lay/lay/doc/manual/tiling.xml
rename to src/doc/doc/manual/tiling.xml
diff --git a/src/lay/lay/doc/manual/trans_sel.xml b/src/doc/doc/manual/trans_sel.xml
similarity index 100%
rename from src/lay/lay/doc/manual/trans_sel.xml
rename to src/doc/doc/manual/trans_sel.xml
diff --git a/src/lay/lay/doc/manual/undo_redo.xml b/src/doc/doc/manual/undo_redo.xml
similarity index 100%
rename from src/lay/lay/doc/manual/undo_redo.xml
rename to src/doc/doc/manual/undo_redo.xml
diff --git a/src/lay/lay/doc/manual/view_options.xml b/src/doc/doc/manual/view_options.xml
similarity index 100%
rename from src/lay/lay/doc/manual/view_options.xml
rename to src/doc/doc/manual/view_options.xml
diff --git a/src/lay/lay/doc/manual/view_state.xml b/src/doc/doc/manual/view_state.xml
similarity index 100%
rename from src/lay/lay/doc/manual/view_state.xml
rename to src/doc/doc/manual/view_state.xml
diff --git a/src/lay/lay/doc/manual/xor.xml b/src/doc/doc/manual/xor.xml
similarity index 100%
rename from src/lay/lay/doc/manual/xor.xml
rename to src/doc/doc/manual/xor.xml
diff --git a/src/lay/lay/doc/manual/zoom.xml b/src/doc/doc/manual/zoom.xml
similarity index 100%
rename from src/lay/lay/doc/manual/zoom.xml
rename to src/doc/doc/manual/zoom.xml
diff --git a/src/lay/lay/doc/programming/application_api.xml b/src/doc/doc/programming/application_api.xml
similarity index 100%
rename from src/lay/lay/doc/programming/application_api.xml
rename to src/doc/doc/programming/application_api.xml
diff --git a/src/lay/lay/doc/programming/box.png b/src/doc/doc/programming/box.png
similarity index 100%
rename from src/lay/lay/doc/programming/box.png
rename to src/doc/doc/programming/box.png
diff --git a/src/lay/lay/doc/programming/database_api.xml b/src/doc/doc/programming/database_api.xml
similarity index 100%
rename from src/lay/lay/doc/programming/database_api.xml
rename to src/doc/doc/programming/database_api.xml
diff --git a/src/lay/lay/doc/programming/edge_relations.png b/src/doc/doc/programming/edge_relations.png
similarity index 100%
rename from src/lay/lay/doc/programming/edge_relations.png
rename to src/doc/doc/programming/edge_relations.png
diff --git a/src/lay/lay/doc/programming/events.xml b/src/doc/doc/programming/events.xml
similarity index 100%
rename from src/lay/lay/doc/programming/events.xml
rename to src/doc/doc/programming/events.xml
diff --git a/src/lay/lay/doc/programming/geometry_api.xml b/src/doc/doc/programming/geometry_api.xml
similarity index 100%
rename from src/lay/lay/doc/programming/geometry_api.xml
rename to src/doc/doc/programming/geometry_api.xml
diff --git a/src/lay/lay/doc/programming/index.xml b/src/doc/doc/programming/index.xml
similarity index 100%
rename from src/lay/lay/doc/programming/index.xml
rename to src/doc/doc/programming/index.xml
diff --git a/src/lay/lay/doc/programming/introduction.xml b/src/doc/doc/programming/introduction.xml
similarity index 100%
rename from src/lay/lay/doc/programming/introduction.xml
rename to src/doc/doc/programming/introduction.xml
diff --git a/src/lay/lay/doc/programming/path.png b/src/doc/doc/programming/path.png
similarity index 100%
rename from src/lay/lay/doc/programming/path.png
rename to src/doc/doc/programming/path.png
diff --git a/src/lay/lay/doc/programming/polygon.png b/src/doc/doc/programming/polygon.png
similarity index 100%
rename from src/lay/lay/doc/programming/polygon.png
rename to src/doc/doc/programming/polygon.png
diff --git a/src/lay/lay/doc/programming/python.xml b/src/doc/doc/programming/python.xml
similarity index 100%
rename from src/lay/lay/doc/programming/python.xml
rename to src/doc/doc/programming/python.xml
diff --git a/src/lay/lay/doc/programming/qt_binding.xml b/src/doc/doc/programming/qt_binding.xml
similarity index 100%
rename from src/lay/lay/doc/programming/qt_binding.xml
rename to src/doc/doc/programming/qt_binding.xml
diff --git a/src/lay/lay/doc/programming/round_ended_path.png b/src/doc/doc/programming/round_ended_path.png
similarity index 100%
rename from src/lay/lay/doc/programming/round_ended_path.png
rename to src/doc/doc/programming/round_ended_path.png
diff --git a/src/lay/lay/doc/programming/ruby_binding.xml b/src/doc/doc/programming/ruby_binding.xml
similarity index 100%
rename from src/lay/lay/doc/programming/ruby_binding.xml
rename to src/doc/doc/programming/ruby_binding.xml
diff --git a/src/lay/lay/doc/programming/ruby_binding_basic.png b/src/doc/doc/programming/ruby_binding_basic.png
similarity index 100%
rename from src/lay/lay/doc/programming/ruby_binding_basic.png
rename to src/doc/doc/programming/ruby_binding_basic.png
diff --git a/src/lay/lay/doc/programming/ruby_binding_callback.png b/src/doc/doc/programming/ruby_binding_callback.png
similarity index 100%
rename from src/lay/lay/doc/programming/ruby_binding_callback.png
rename to src/doc/doc/programming/ruby_binding_callback.png
diff --git a/src/lay/lay/doc/programming/ruby_pcells.xml b/src/doc/doc/programming/ruby_pcells.xml
similarity index 100%
rename from src/lay/lay/doc/programming/ruby_pcells.xml
rename to src/doc/doc/programming/ruby_pcells.xml
diff --git a/src/lay/lay/doc/programming/simple_polygon.png b/src/doc/doc/programming/simple_polygon.png
similarity index 100%
rename from src/lay/lay/doc/programming/simple_polygon.png
rename to src/doc/doc/programming/simple_polygon.png
diff --git a/src/doc/docCommon.h b/src/doc/docCommon.h
new file mode 100644
index 000000000..3d5edfd11
--- /dev/null
+++ b/src/doc/docCommon.h
@@ -0,0 +1,51 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#if !defined(HDR_docCommon_h)
+# define HDR_docCommon_h
+
+# if defined _WIN32 || defined __CYGWIN__
+
+#   ifdef MAKE_DOC_LIBRARY
+#     define DOC_PUBLIC __declspec(dllexport)
+#   else
+#     define DOC_PUBLIC __declspec(dllimport)
+#   endif
+#   define DOC_LOCAL
+#   define DOC_PUBLIC_TEMPLATE
+
+# else
+
+#   if __GNUC__ >= 4 || defined(__clang__)
+#     define DOC_PUBLIC __attribute__ ((visibility ("default")))
+#     define DOC_PUBLIC_TEMPLATE __attribute__ ((visibility ("default")))
+#     define DOC_LOCAL  __attribute__ ((visibility ("hidden")))
+#   else
+#     define DOC_PUBLIC
+#     define DOC_PUBLIC_TEMPLATE
+#     define DOC_LOCAL
+#   endif
+
+# endif
+
+#endif
diff --git a/src/lay/lay/layDRCLVSHelpResources.qrc b/src/doc/docDRCLVSResources.qrc
similarity index 100%
rename from src/lay/lay/layDRCLVSHelpResources.qrc
rename to src/doc/docDRCLVSResources.qrc
diff --git a/src/doc/docForceLink.cc b/src/doc/docForceLink.cc
new file mode 100644
index 000000000..b8711e3eb
--- /dev/null
+++ b/src/doc/docForceLink.cc
@@ -0,0 +1,32 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "docForceLink.h"
+
+namespace doc
+{
+  int _force_link_f ()
+  {
+    return 0;
+  }
+}
+
diff --git a/src/doc/docForceLink.h b/src/doc/docForceLink.h
new file mode 100644
index 000000000..f2020fb69
--- /dev/null
+++ b/src/doc/docForceLink.h
@@ -0,0 +1,40 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#ifndef HDR_docForceLink
+#define HDR_docForceLink
+
+#include "docCommon.h"
+
+/**
+ *  @file Include this function to force linking of the doc module
+ */
+
+namespace doc
+{
+  DOC_PUBLIC int _force_link_f ();
+  static int _force_link_target = _force_link_f ();
+}
+
+#endif
+
diff --git a/src/lay/lay/layHelpResources.qrc b/src/doc/docResources.qrc
similarity index 100%
rename from src/lay/lay/layHelpResources.qrc
rename to src/doc/docResources.qrc
diff --git a/src/icons/icons.pro b/src/icons/icons.pro
new file mode 100644
index 000000000..071d66895
--- /dev/null
+++ b/src/icons/icons.pro
@@ -0,0 +1,18 @@
+
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_icons
+
+include($$PWD/../lib.pri)
+
+DEFINES += MAKE_ICONS_LIBRARY
+
+HEADERS = \
+
+FORMS = \
+
+SOURCES = \
+    iconsForceLink.cc \
+
+RESOURCES = \
+    icons.qrc \
+
diff --git a/src/lay/lay/layResources.qrc b/src/icons/icons.qrc
similarity index 98%
rename from src/lay/lay/layResources.qrc
rename to src/icons/icons.qrc
index 041ac55e1..5f3094346 100644
--- a/src/lay/lay/layResources.qrc
+++ b/src/icons/icons.qrc
@@ -138,8 +138,4 @@
         <file alias="bookmark.png">images/bookmark.png</file>
         <file alias="bookmark_16.png">images/bookmark_16.png</file>
     </qresource>
-    <qresource prefix="/syntax">
-        <file alias="ruby.xml">syntax/ruby.xml</file>
-        <file alias="python.xml">syntax/python.xml</file>
-    </qresource>
 </RCC>
diff --git a/src/icons/iconsCommon.h b/src/icons/iconsCommon.h
new file mode 100644
index 000000000..c1ba58602
--- /dev/null
+++ b/src/icons/iconsCommon.h
@@ -0,0 +1,51 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#if !defined(HDR_iconsCommon_h)
+# define HDR_iconsCommon_h
+
+# if defined _WIN32 || defined __CYGWIN__
+
+#   ifdef MAKE_ICONS_LIBRARY
+#     define ICONS_PUBLIC __declspec(dllexport)
+#   else
+#     define ICONS_PUBLIC __declspec(dllimport)
+#   endif
+#   define ICONS_LOCAL
+#   define ICONS_PUBLIC_TEMPLATE
+
+# else
+
+#   if __GNUC__ >= 4 || defined(__clang__)
+#     define ICONS_PUBLIC __attribute__ ((visibility ("default")))
+#     define ICONS_PUBLIC_TEMPLATE __attribute__ ((visibility ("default")))
+#     define ICONS_LOCAL  __attribute__ ((visibility ("hidden")))
+#   else
+#     define ICONS_PUBLIC
+#     define ICONS_PUBLIC_TEMPLATE
+#     define ICONS_LOCAL
+#   endif
+
+# endif
+
+#endif
diff --git a/src/icons/iconsForceLink.cc b/src/icons/iconsForceLink.cc
new file mode 100644
index 000000000..66d1a720d
--- /dev/null
+++ b/src/icons/iconsForceLink.cc
@@ -0,0 +1,32 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "iconsForceLink.h"
+
+namespace icons
+{
+  int _force_link_f ()
+  {
+    return 0;
+  }
+}
+
diff --git a/src/icons/iconsForceLink.h b/src/icons/iconsForceLink.h
new file mode 100644
index 000000000..63569d665
--- /dev/null
+++ b/src/icons/iconsForceLink.h
@@ -0,0 +1,40 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#ifndef HDR_iconsForceLink
+#define HDR_iconsForceLink
+
+#include "iconsCommon.h"
+
+/**
+ *  @file Include this function to force linking of the icons module
+ */
+
+namespace icons
+{
+  ICONS_PUBLIC int _force_link_f ();
+  static int _force_link_target = _force_link_f ();
+}
+
+#endif
+
diff --git a/src/lay/lay/images/add.png b/src/icons/images/add.png
similarity index 100%
rename from src/lay/lay/images/add.png
rename to src/icons/images/add.png
diff --git a/src/lay/lay/images/align_bottom.png b/src/icons/images/align_bottom.png
similarity index 100%
rename from src/lay/lay/images/align_bottom.png
rename to src/icons/images/align_bottom.png
diff --git a/src/lay/lay/images/align_hcenter.png b/src/icons/images/align_hcenter.png
similarity index 100%
rename from src/lay/lay/images/align_hcenter.png
rename to src/icons/images/align_hcenter.png
diff --git a/src/lay/lay/images/align_left.png b/src/icons/images/align_left.png
similarity index 100%
rename from src/lay/lay/images/align_left.png
rename to src/icons/images/align_left.png
diff --git a/src/lay/lay/images/align_none.png b/src/icons/images/align_none.png
similarity index 100%
rename from src/lay/lay/images/align_none.png
rename to src/icons/images/align_none.png
diff --git a/src/lay/lay/images/align_right.png b/src/icons/images/align_right.png
similarity index 100%
rename from src/lay/lay/images/align_right.png
rename to src/icons/images/align_right.png
diff --git a/src/lay/lay/images/align_top.png b/src/icons/images/align_top.png
similarity index 100%
rename from src/lay/lay/images/align_top.png
rename to src/icons/images/align_top.png
diff --git a/src/lay/lay/images/align_vcenter.png b/src/icons/images/align_vcenter.png
similarity index 100%
rename from src/lay/lay/images/align_vcenter.png
rename to src/icons/images/align_vcenter.png
diff --git a/src/lay/lay/images/back.png b/src/icons/images/back.png
similarity index 100%
rename from src/lay/lay/images/back.png
rename to src/icons/images/back.png
diff --git a/src/lay/lay/images/back_16.png b/src/icons/images/back_16.png
similarity index 100%
rename from src/lay/lay/images/back_16.png
rename to src/icons/images/back_16.png
diff --git a/src/lay/lay/images/blue_flag.png b/src/icons/images/blue_flag.png
similarity index 100%
rename from src/lay/lay/images/blue_flag.png
rename to src/icons/images/blue_flag.png
diff --git a/src/lay/lay/images/bookmark.png b/src/icons/images/bookmark.png
similarity index 100%
rename from src/lay/lay/images/bookmark.png
rename to src/icons/images/bookmark.png
diff --git a/src/lay/lay/images/bookmark_16.png b/src/icons/images/bookmark_16.png
similarity index 100%
rename from src/lay/lay/images/bookmark_16.png
rename to src/icons/images/bookmark_16.png
diff --git a/src/lay/lay/images/box.png b/src/icons/images/box.png
similarity index 100%
rename from src/lay/lay/images/box.png
rename to src/icons/images/box.png
diff --git a/src/lay/lay/images/breakpoint.png b/src/icons/images/breakpoint.png
similarity index 100%
rename from src/lay/lay/images/breakpoint.png
rename to src/icons/images/breakpoint.png
diff --git a/src/lay/lay/images/breakpointmark.png b/src/icons/images/breakpointmark.png
similarity index 100%
rename from src/lay/lay/images/breakpointmark.png
rename to src/icons/images/breakpointmark.png
diff --git a/src/lay/lay/images/breakpointmarkdisabled.png b/src/icons/images/breakpointmarkdisabled.png
similarity index 100%
rename from src/lay/lay/images/breakpointmarkdisabled.png
rename to src/icons/images/breakpointmarkdisabled.png
diff --git a/src/lay/lay/images/bright.png b/src/icons/images/bright.png
similarity index 100%
rename from src/lay/lay/images/bright.png
rename to src/icons/images/bright.png
diff --git a/src/lay/lay/images/bug.png b/src/icons/images/bug.png
similarity index 100%
rename from src/lay/lay/images/bug.png
rename to src/icons/images/bug.png
diff --git a/src/lay/lay/images/bulb.png b/src/icons/images/bulb.png
similarity index 100%
rename from src/lay/lay/images/bulb.png
rename to src/icons/images/bulb.png
diff --git a/src/lay/lay/images/cb.png b/src/icons/images/cb.png
similarity index 100%
rename from src/lay/lay/images/cb.png
rename to src/icons/images/cb.png
diff --git a/src/lay/lay/images/cc.png b/src/icons/images/cc.png
similarity index 100%
rename from src/lay/lay/images/cc.png
rename to src/icons/images/cc.png
diff --git a/src/lay/lay/images/checked.png b/src/icons/images/checked.png
similarity index 100%
rename from src/lay/lay/images/checked.png
rename to src/icons/images/checked.png
diff --git a/src/lay/lay/images/clear.png b/src/icons/images/clear.png
similarity index 100%
rename from src/lay/lay/images/clear.png
rename to src/icons/images/clear.png
diff --git a/src/lay/lay/images/clear_edit.png b/src/icons/images/clear_edit.png
similarity index 100%
rename from src/lay/lay/images/clear_edit.png
rename to src/icons/images/clear_edit.png
diff --git a/src/lay/lay/images/clearbreakpoints.png b/src/icons/images/clearbreakpoints.png
similarity index 100%
rename from src/lay/lay/images/clearbreakpoints.png
rename to src/icons/images/clearbreakpoints.png
diff --git a/src/lay/lay/images/close.png b/src/icons/images/close.png
similarity index 100%
rename from src/lay/lay/images/close.png
rename to src/icons/images/close.png
diff --git a/src/lay/lay/images/cm_add.png b/src/icons/images/cm_add.png
similarity index 100%
rename from src/lay/lay/images/cm_add.png
rename to src/icons/images/cm_add.png
diff --git a/src/lay/lay/images/cm_diff.png b/src/icons/images/cm_diff.png
similarity index 100%
rename from src/lay/lay/images/cm_diff.png
rename to src/icons/images/cm_diff.png
diff --git a/src/lay/lay/images/cm_erase.png b/src/icons/images/cm_erase.png
similarity index 100%
rename from src/lay/lay/images/cm_erase.png
rename to src/icons/images/cm_erase.png
diff --git a/src/lay/lay/images/cm_mask.png b/src/icons/images/cm_mask.png
similarity index 100%
rename from src/lay/lay/images/cm_mask.png
rename to src/icons/images/cm_mask.png
diff --git a/src/lay/lay/images/cm_merge.png b/src/icons/images/cm_merge.png
similarity index 100%
rename from src/lay/lay/images/cm_merge.png
rename to src/icons/images/cm_merge.png
diff --git a/src/lay/lay/images/ct.png b/src/icons/images/ct.png
similarity index 100%
rename from src/lay/lay/images/ct.png
rename to src/icons/images/ct.png
diff --git a/src/lay/lay/images/dark.png b/src/icons/images/dark.png
similarity index 100%
rename from src/lay/lay/images/dark.png
rename to src/icons/images/dark.png
diff --git a/src/lay/lay/images/debug.png b/src/icons/images/debug.png
similarity index 100%
rename from src/lay/lay/images/debug.png
rename to src/icons/images/debug.png
diff --git a/src/lay/lay/images/defaultmacroicon.png b/src/icons/images/defaultmacroicon.png
similarity index 100%
rename from src/lay/lay/images/defaultmacroicon.png
rename to src/icons/images/defaultmacroicon.png
diff --git a/src/lay/lay/images/del.png b/src/icons/images/del.png
similarity index 100%
rename from src/lay/lay/images/del.png
rename to src/icons/images/del.png
diff --git a/src/lay/lay/images/down.png b/src/icons/images/down.png
similarity index 100%
rename from src/lay/lay/images/down.png
rename to src/icons/images/down.png
diff --git a/src/lay/lay/images/downdown.png b/src/icons/images/downdown.png
similarity index 100%
rename from src/lay/lay/images/downdown.png
rename to src/icons/images/downdown.png
diff --git a/src/lay/lay/images/edit.png b/src/icons/images/edit.png
similarity index 100%
rename from src/lay/lay/images/edit.png
rename to src/icons/images/edit.png
diff --git a/src/lay/lay/images/empty_12.png b/src/icons/images/empty_12.png
similarity index 100%
rename from src/lay/lay/images/empty_12.png
rename to src/icons/images/empty_12.png
diff --git a/src/lay/lay/images/empty_16.png b/src/icons/images/empty_16.png
similarity index 100%
rename from src/lay/lay/images/empty_16.png
rename to src/icons/images/empty_16.png
diff --git a/src/lay/lay/images/error2_16.png b/src/icons/images/error2_16.png
similarity index 100%
rename from src/lay/lay/images/error2_16.png
rename to src/icons/images/error2_16.png
diff --git a/src/lay/lay/images/error_16.png b/src/icons/images/error_16.png
similarity index 100%
rename from src/lay/lay/images/error_16.png
rename to src/icons/images/error_16.png
diff --git a/src/lay/lay/images/execmark.png b/src/icons/images/execmark.png
similarity index 100%
rename from src/lay/lay/images/execmark.png
rename to src/icons/images/execmark.png
diff --git a/src/lay/lay/images/file_12.png b/src/icons/images/file_12.png
similarity index 100%
rename from src/lay/lay/images/file_12.png
rename to src/icons/images/file_12.png
diff --git a/src/lay/lay/images/find.png b/src/icons/images/find.png
similarity index 100%
rename from src/lay/lay/images/find.png
rename to src/icons/images/find.png
diff --git a/src/lay/lay/images/fit_back.png b/src/icons/images/fit_back.png
similarity index 100%
rename from src/lay/lay/images/fit_back.png
rename to src/icons/images/fit_back.png
diff --git a/src/lay/lay/images/fit_bottom.png b/src/icons/images/fit_bottom.png
similarity index 100%
rename from src/lay/lay/images/fit_bottom.png
rename to src/icons/images/fit_bottom.png
diff --git a/src/lay/lay/images/fit_front.png b/src/icons/images/fit_front.png
similarity index 100%
rename from src/lay/lay/images/fit_front.png
rename to src/icons/images/fit_front.png
diff --git a/src/lay/lay/images/fit_left.png b/src/icons/images/fit_left.png
similarity index 100%
rename from src/lay/lay/images/fit_left.png
rename to src/icons/images/fit_left.png
diff --git a/src/lay/lay/images/fit_right.png b/src/icons/images/fit_right.png
similarity index 100%
rename from src/lay/lay/images/fit_right.png
rename to src/icons/images/fit_right.png
diff --git a/src/lay/lay/images/fit_top.png b/src/icons/images/fit_top.png
similarity index 100%
rename from src/lay/lay/images/fit_top.png
rename to src/icons/images/fit_top.png
diff --git a/src/lay/lay/images/fliph.png b/src/icons/images/fliph.png
similarity index 100%
rename from src/lay/lay/images/fliph.png
rename to src/icons/images/fliph.png
diff --git a/src/lay/lay/images/flipv.png b/src/icons/images/flipv.png
similarity index 100%
rename from src/lay/lay/images/flipv.png
rename to src/icons/images/flipv.png
diff --git a/src/lay/lay/images/folder.png b/src/icons/images/folder.png
similarity index 100%
rename from src/lay/lay/images/folder.png
rename to src/icons/images/folder.png
diff --git a/src/lay/lay/images/folder_12.png b/src/icons/images/folder_12.png
similarity index 100%
rename from src/lay/lay/images/folder_12.png
rename to src/icons/images/folder_12.png
diff --git a/src/lay/lay/images/forward.png b/src/icons/images/forward.png
similarity index 100%
rename from src/lay/lay/images/forward.png
rename to src/icons/images/forward.png
diff --git a/src/lay/lay/images/forward_16.png b/src/icons/images/forward_16.png
similarity index 100%
rename from src/lay/lay/images/forward_16.png
rename to src/icons/images/forward_16.png
diff --git a/src/lay/lay/images/generalmacroicon.png b/src/icons/images/generalmacroicon.png
similarity index 100%
rename from src/lay/lay/images/generalmacroicon.png
rename to src/icons/images/generalmacroicon.png
diff --git a/src/lay/lay/images/generalmacroiconactive.png b/src/icons/images/generalmacroiconactive.png
similarity index 100%
rename from src/lay/lay/images/generalmacroiconactive.png
rename to src/icons/images/generalmacroiconactive.png
diff --git a/src/lay/lay/images/green_flag.png b/src/icons/images/green_flag.png
similarity index 100%
rename from src/lay/lay/images/green_flag.png
rename to src/icons/images/green_flag.png
diff --git a/src/lay/lay/images/gtf_basic.png b/src/icons/images/gtf_basic.png
similarity index 100%
rename from src/lay/lay/images/gtf_basic.png
rename to src/icons/images/gtf_basic.png
diff --git a/src/lay/lay/images/gtf_lb.png b/src/icons/images/gtf_lb.png
similarity index 100%
rename from src/lay/lay/images/gtf_lb.png
rename to src/icons/images/gtf_lb.png
diff --git a/src/lay/lay/images/gtf_mb.png b/src/icons/images/gtf_mb.png
similarity index 100%
rename from src/lay/lay/images/gtf_mb.png
rename to src/icons/images/gtf_mb.png
diff --git a/src/lay/lay/images/gtf_rb.png b/src/icons/images/gtf_rb.png
similarity index 100%
rename from src/lay/lay/images/gtf_rb.png
rename to src/icons/images/gtf_rb.png
diff --git a/src/lay/lay/images/help.png b/src/icons/images/help.png
similarity index 100%
rename from src/lay/lay/images/help.png
rename to src/icons/images/help.png
diff --git a/src/lay/lay/images/home.png b/src/icons/images/home.png
similarity index 100%
rename from src/lay/lay/images/home.png
rename to src/icons/images/home.png
diff --git a/src/lay/lay/images/import.png b/src/icons/images/import.png
similarity index 100%
rename from src/lay/lay/images/import.png
rename to src/icons/images/import.png
diff --git a/src/lay/lay/images/important.png b/src/icons/images/important.png
similarity index 100%
rename from src/lay/lay/images/important.png
rename to src/icons/images/important.png
diff --git a/src/lay/lay/images/info_16.png b/src/icons/images/info_16.png
similarity index 100%
rename from src/lay/lay/images/info_16.png
rename to src/icons/images/info_16.png
diff --git a/src/lay/lay/images/instance.png b/src/icons/images/instance.png
similarity index 100%
rename from src/lay/lay/images/instance.png
rename to src/icons/images/instance.png
diff --git a/src/lay/lay/images/invert.png b/src/icons/images/invert.png
similarity index 100%
rename from src/lay/lay/images/invert.png
rename to src/icons/images/invert.png
diff --git a/src/lay/lay/images/lb.png b/src/icons/images/lb.png
similarity index 100%
rename from src/lay/lay/images/lb.png
rename to src/icons/images/lb.png
diff --git a/src/lay/lay/images/lc.png b/src/icons/images/lc.png
similarity index 100%
rename from src/lay/lay/images/lc.png
rename to src/icons/images/lc.png
diff --git a/src/lay/lay/images/left.png b/src/icons/images/left.png
similarity index 100%
rename from src/lay/lay/images/left.png
rename to src/icons/images/left.png
diff --git a/src/lay/lay/images/locked_16.png b/src/icons/images/locked_16.png
similarity index 100%
rename from src/lay/lay/images/locked_16.png
rename to src/icons/images/locked_16.png
diff --git a/src/lay/lay/images/logo.png b/src/icons/images/logo.png
similarity index 100%
rename from src/lay/lay/images/logo.png
rename to src/icons/images/logo.png
diff --git a/src/lay/lay/images/lt.png b/src/icons/images/lt.png
similarity index 100%
rename from src/lay/lay/images/lt.png
rename to src/icons/images/lt.png
diff --git a/src/lay/lay/images/m0.png b/src/icons/images/m0.png
similarity index 100%
rename from src/lay/lay/images/m0.png
rename to src/icons/images/m0.png
diff --git a/src/lay/lay/images/m135.png b/src/icons/images/m135.png
similarity index 100%
rename from src/lay/lay/images/m135.png
rename to src/icons/images/m135.png
diff --git a/src/lay/lay/images/m45.png b/src/icons/images/m45.png
similarity index 100%
rename from src/lay/lay/images/m45.png
rename to src/icons/images/m45.png
diff --git a/src/lay/lay/images/m90.png b/src/icons/images/m90.png
similarity index 100%
rename from src/lay/lay/images/m90.png
rename to src/icons/images/m90.png
diff --git a/src/lay/lay/images/marked_16.png b/src/icons/images/marked_16.png
similarity index 100%
rename from src/lay/lay/images/marked_16.png
rename to src/icons/images/marked_16.png
diff --git a/src/lay/lay/images/marked_24.png b/src/icons/images/marked_24.png
similarity index 100%
rename from src/lay/lay/images/marked_24.png
rename to src/icons/images/marked_24.png
diff --git a/src/lay/lay/images/marked_64.png b/src/icons/images/marked_64.png
similarity index 100%
rename from src/lay/lay/images/marked_64.png
rename to src/icons/images/marked_64.png
diff --git a/src/lay/lay/images/move.png b/src/icons/images/move.png
similarity index 100%
rename from src/lay/lay/images/move.png
rename to src/icons/images/move.png
diff --git a/src/lay/lay/images/move_simple.png b/src/icons/images/move_simple.png
similarity index 100%
rename from src/lay/lay/images/move_simple.png
rename to src/icons/images/move_simple.png
diff --git a/src/lay/lay/images/neutral.png b/src/icons/images/neutral.png
similarity index 100%
rename from src/lay/lay/images/neutral.png
rename to src/icons/images/neutral.png
diff --git a/src/lay/lay/images/new_folder.png b/src/icons/images/new_folder.png
similarity index 100%
rename from src/lay/lay/images/new_folder.png
rename to src/icons/images/new_folder.png
diff --git a/src/lay/lay/images/next_topic.png b/src/icons/images/next_topic.png
similarity index 100%
rename from src/lay/lay/images/next_topic.png
rename to src/icons/images/next_topic.png
diff --git a/src/lay/lay/images/nextstep.png b/src/icons/images/nextstep.png
similarity index 100%
rename from src/lay/lay/images/nextstep.png
rename to src/icons/images/nextstep.png
diff --git a/src/lay/lay/images/no_flag.png b/src/icons/images/no_flag.png
similarity index 100%
rename from src/lay/lay/images/no_flag.png
rename to src/icons/images/no_flag.png
diff --git a/src/lay/lay/images/nophoto.png b/src/icons/images/nophoto.png
similarity index 100%
rename from src/lay/lay/images/nophoto.png
rename to src/icons/images/nophoto.png
diff --git a/src/lay/lay/images/options_edit.png b/src/icons/images/options_edit.png
similarity index 100%
rename from src/lay/lay/images/options_edit.png
rename to src/icons/images/options_edit.png
diff --git a/src/lay/lay/images/partial.png b/src/icons/images/partial.png
similarity index 100%
rename from src/lay/lay/images/partial.png
rename to src/icons/images/partial.png
diff --git a/src/lay/lay/images/path.png b/src/icons/images/path.png
similarity index 100%
rename from src/lay/lay/images/path.png
rename to src/icons/images/path.png
diff --git a/src/lay/lay/images/pause.png b/src/icons/images/pause.png
similarity index 100%
rename from src/lay/lay/images/pause.png
rename to src/icons/images/pause.png
diff --git a/src/lay/lay/images/photo.png b/src/icons/images/photo.png
similarity index 100%
rename from src/lay/lay/images/photo.png
rename to src/icons/images/photo.png
diff --git a/src/lay/lay/images/polygon.png b/src/icons/images/polygon.png
similarity index 100%
rename from src/lay/lay/images/polygon.png
rename to src/icons/images/polygon.png
diff --git a/src/lay/lay/images/prev_topic.png b/src/icons/images/prev_topic.png
similarity index 100%
rename from src/lay/lay/images/prev_topic.png
rename to src/icons/images/prev_topic.png
diff --git a/src/lay/lay/images/properties.png b/src/icons/images/properties.png
similarity index 100%
rename from src/lay/lay/images/properties.png
rename to src/icons/images/properties.png
diff --git a/src/lay/lay/images/pythonmacroicon.png b/src/icons/images/pythonmacroicon.png
similarity index 100%
rename from src/lay/lay/images/pythonmacroicon.png
rename to src/icons/images/pythonmacroicon.png
diff --git a/src/lay/lay/images/pythonmacroiconactive.png b/src/icons/images/pythonmacroiconactive.png
similarity index 100%
rename from src/lay/lay/images/pythonmacroiconactive.png
rename to src/icons/images/pythonmacroiconactive.png
diff --git a/src/lay/lay/images/r0.png b/src/icons/images/r0.png
similarity index 100%
rename from src/lay/lay/images/r0.png
rename to src/icons/images/r0.png
diff --git a/src/lay/lay/images/r180.png b/src/icons/images/r180.png
similarity index 100%
rename from src/lay/lay/images/r180.png
rename to src/icons/images/r180.png
diff --git a/src/lay/lay/images/r270.png b/src/icons/images/r270.png
similarity index 100%
rename from src/lay/lay/images/r270.png
rename to src/icons/images/r270.png
diff --git a/src/lay/lay/images/r90.png b/src/icons/images/r90.png
similarity index 100%
rename from src/lay/lay/images/r90.png
rename to src/icons/images/r90.png
diff --git a/src/lay/lay/images/rb.png b/src/icons/images/rb.png
similarity index 100%
rename from src/lay/lay/images/rb.png
rename to src/icons/images/rb.png
diff --git a/src/lay/lay/images/rc.png b/src/icons/images/rc.png
similarity index 100%
rename from src/lay/lay/images/rc.png
rename to src/icons/images/rc.png
diff --git a/src/lay/lay/images/red_flag.png b/src/icons/images/red_flag.png
similarity index 100%
rename from src/lay/lay/images/red_flag.png
rename to src/icons/images/red_flag.png
diff --git a/src/lay/lay/images/rename.png b/src/icons/images/rename.png
similarity index 100%
rename from src/lay/lay/images/rename.png
rename to src/icons/images/rename.png
diff --git a/src/lay/lay/images/replace.png b/src/icons/images/replace.png
similarity index 100%
rename from src/lay/lay/images/replace.png
rename to src/icons/images/replace.png
diff --git a/src/lay/lay/images/replace_all.png b/src/icons/images/replace_all.png
similarity index 100%
rename from src/lay/lay/images/replace_all.png
rename to src/icons/images/replace_all.png
diff --git a/src/lay/lay/images/right.png b/src/icons/images/right.png
similarity index 100%
rename from src/lay/lay/images/right.png
rename to src/icons/images/right.png
diff --git a/src/lay/lay/images/rotate.png b/src/icons/images/rotate.png
similarity index 100%
rename from src/lay/lay/images/rotate.png
rename to src/icons/images/rotate.png
diff --git a/src/lay/lay/images/rt.png b/src/icons/images/rt.png
similarity index 100%
rename from src/lay/lay/images/rt.png
rename to src/icons/images/rt.png
diff --git a/src/lay/lay/images/rubymacroicon.png b/src/icons/images/rubymacroicon.png
similarity index 100%
rename from src/lay/lay/images/rubymacroicon.png
rename to src/icons/images/rubymacroicon.png
diff --git a/src/lay/lay/images/rubymacroiconactive.png b/src/icons/images/rubymacroiconactive.png
similarity index 100%
rename from src/lay/lay/images/rubymacroiconactive.png
rename to src/icons/images/rubymacroiconactive.png
diff --git a/src/lay/lay/images/ruler.png b/src/icons/images/ruler.png
similarity index 100%
rename from src/lay/lay/images/ruler.png
rename to src/icons/images/ruler.png
diff --git a/src/lay/lay/images/run.png b/src/icons/images/run.png
similarity index 100%
rename from src/lay/lay/images/run.png
rename to src/icons/images/run.png
diff --git a/src/lay/lay/images/runthis.png b/src/icons/images/runthis.png
similarity index 100%
rename from src/lay/lay/images/runthis.png
rename to src/icons/images/runthis.png
diff --git a/src/lay/lay/images/salt.png b/src/icons/images/salt.png
similarity index 100%
rename from src/lay/lay/images/salt.png
rename to src/icons/images/salt.png
diff --git a/src/lay/lay/images/salt_icon.png b/src/icons/images/salt_icon.png
similarity index 100%
rename from src/lay/lay/images/salt_icon.png
rename to src/icons/images/salt_icon.png
diff --git a/src/lay/lay/images/save.png b/src/icons/images/save.png
similarity index 100%
rename from src/lay/lay/images/save.png
rename to src/icons/images/save.png
diff --git a/src/lay/lay/images/save_all.png b/src/icons/images/save_all.png
similarity index 100%
rename from src/lay/lay/images/save_all.png
rename to src/icons/images/save_all.png
diff --git a/src/lay/lay/images/select.png b/src/icons/images/select.png
similarity index 100%
rename from src/lay/lay/images/select.png
rename to src/icons/images/select.png
diff --git a/src/lay/lay/images/setup.png b/src/icons/images/setup.png
similarity index 100%
rename from src/lay/lay/images/setup.png
rename to src/icons/images/setup.png
diff --git a/src/lay/lay/images/singlestep.png b/src/icons/images/singlestep.png
similarity index 100%
rename from src/lay/lay/images/singlestep.png
rename to src/icons/images/singlestep.png
diff --git a/src/lay/lay/images/stop.png b/src/icons/images/stop.png
similarity index 100%
rename from src/lay/lay/images/stop.png
rename to src/icons/images/stop.png
diff --git a/src/lay/lay/images/techs.png b/src/icons/images/techs.png
similarity index 100%
rename from src/lay/lay/images/techs.png
rename to src/icons/images/techs.png
diff --git a/src/lay/lay/images/text.png b/src/icons/images/text.png
similarity index 100%
rename from src/lay/lay/images/text.png
rename to src/icons/images/text.png
diff --git a/src/lay/lay/images/textdocumenticon.png b/src/icons/images/textdocumenticon.png
similarity index 100%
rename from src/lay/lay/images/textdocumenticon.png
rename to src/icons/images/textdocumenticon.png
diff --git a/src/lay/lay/images/unchecked.png b/src/icons/images/unchecked.png
similarity index 100%
rename from src/lay/lay/images/unchecked.png
rename to src/icons/images/unchecked.png
diff --git a/src/lay/lay/images/unlocked_16.png b/src/icons/images/unlocked_16.png
similarity index 100%
rename from src/lay/lay/images/unlocked_16.png
rename to src/icons/images/unlocked_16.png
diff --git a/src/lay/lay/images/up.png b/src/icons/images/up.png
similarity index 100%
rename from src/lay/lay/images/up.png
rename to src/icons/images/up.png
diff --git a/src/lay/lay/images/upup.png b/src/icons/images/upup.png
similarity index 100%
rename from src/lay/lay/images/upup.png
rename to src/icons/images/upup.png
diff --git a/src/lay/lay/images/waived.png b/src/icons/images/waived.png
similarity index 100%
rename from src/lay/lay/images/waived.png
rename to src/icons/images/waived.png
diff --git a/src/lay/lay/images/warn.png b/src/icons/images/warn.png
similarity index 100%
rename from src/lay/lay/images/warn.png
rename to src/icons/images/warn.png
diff --git a/src/lay/lay/images/warn_16.png b/src/icons/images/warn_16.png
similarity index 100%
rename from src/lay/lay/images/warn_16.png
rename to src/icons/images/warn_16.png
diff --git a/src/lay/lay/images/yellow_flag.png b/src/icons/images/yellow_flag.png
similarity index 100%
rename from src/lay/lay/images/yellow_flag.png
rename to src/icons/images/yellow_flag.png
diff --git a/src/klayout.pri b/src/klayout.pri
index 48ddb352c..042cf972f 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -15,6 +15,8 @@ LAYBASIC_INC = $$PWD/laybasic/laybasic
 LAYVIEW_INC = $$PWD/layview/layview
 LAYUI_INC = $$PWD/layui/layui
 LAY_INC = $$PWD/lay/lay
+DOC_INC = $$PWD/doc
+ICONS_INC = $$PWD/icons
 
 QTBASIC_INC = $$PWD/gsiqt/qtbasic
 
diff --git a/src/klayout.pro b/src/klayout.pro
index ff82db09e..1d8af5b94 100644
--- a/src/klayout.pro
+++ b/src/klayout.pro
@@ -31,6 +31,8 @@ equals(HAVE_RUBY, "1") {
     lay \
     layui \
     fontgen \
+    doc \
+    icons \
 
 }
 
diff --git a/src/klayout_main/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc
index 54086adc0..40cca527b 100644
--- a/src/klayout_main/klayout_main/klayout.cc
+++ b/src/klayout_main/klayout_main/klayout.cc
@@ -42,6 +42,8 @@
 #include "libForceLink.h"
 #include "antForceLink.h"
 #include "imgForceLink.h"
+#include "docForceLink.h"
+#include "iconsForceLink.h"
 #if defined(HAVE_RUBY)
 #include "drcForceLink.h"
 #include "lvsForceLink.h"
diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro
index ccd8932fc..45bad98c2 100644
--- a/src/klayout_main/klayout_main/klayout_main.pro
+++ b/src/klayout_main/klayout_main/klayout_main.pro
@@ -5,7 +5,6 @@ include($$PWD/../../klayout.pri)
 
 TARGET = klayout
 
-include($$PWD/../../klayout.pri)
 include($$PWD/../../app.pri)
 include($$PWD/../../with_all_libs.pri)
 
@@ -22,8 +21,10 @@ win32 {
   RC_FILE = $$PWD/klayout.rc
 }
 
-INCLUDEPATH += $$QTBASIC_INC
-DEPENDPATH += $$QTBASIC_INC
+INCLUDEPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
+DEPENDPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
+
+LIBS += -lklayout_doc -lklayout_icons
 
 equals(HAVE_QTBINDINGS, "1") {
 
diff --git a/src/lay/lay/doc/navigator_sep.png b/src/lay/lay/doc/navigator_sep.png
deleted file mode 100644
index 6eeeb264a..000000000
Binary files a/src/lay/lay/doc/navigator_sep.png and /dev/null differ
diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro
index a30887eb7..8bd49c256 100644
--- a/src/lay/lay/lay.pro
+++ b/src/lay/lay/lay.pro
@@ -174,11 +174,9 @@ SOURCES = \
     layViewWidgetStack.cc
 
 RESOURCES = layBuildInMacros.qrc \
-    layHelpResources.qrc \
     layMacroTemplates.qrc \
-    layResources.qrc \
+    laySyntaxHighlighters.qrc \
     laySaltTemplates.qrc \
-    layDRCLVSHelpResources.qrc
 
 INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
 DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
diff --git a/src/lay/lay/laySyntaxHighlighters.qrc b/src/lay/lay/laySyntaxHighlighters.qrc
new file mode 100644
index 000000000..7bcb25f0e
--- /dev/null
+++ b/src/lay/lay/laySyntaxHighlighters.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/syntax">
+        <file alias="ruby.xml">syntax/ruby.xml</file>
+        <file alias="python.xml">syntax/python.xml</file>
+    </qresource>
+</RCC>
diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro
index 037825ce8..f3b530330 100644
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic/laybasic.pro
@@ -115,7 +115,6 @@ HEADERS += \
   layNetColorizer.h \
   layObjectInstPath.h \
   layParsedLayerSource.h \
-  tlPixelBuffer.h \
   layPixelBufferPainter.h \
   layPlugin.h \
   layRedrawLayerInfo.h \
diff --git a/src/layui/layui/laySaveLayoutOptionsDialog.h b/src/layui/layui/laySaveLayoutOptionsDialog.h
index ba337ce20..8a333d93a 100644
--- a/src/layui/layui/laySaveLayoutOptionsDialog.h
+++ b/src/layui/layui/laySaveLayoutOptionsDialog.h
@@ -48,7 +48,7 @@ namespace Ui
 {
   class SaveLayoutAsOptionsDialog;
   class SaveLayoutOptionsDialog;
-};
+}
 
 namespace lay
 {