diff --git a/examples/digital/74HCng_short_2.lib b/examples/digital/compare/74HCng_short_2.lib
similarity index 100%
rename from examples/digital/74HCng_short_2.lib
rename to examples/digital/compare/74HCng_short_2.lib
diff --git a/examples/digital/adder-comparison.txt b/examples/digital/compare/adder-comparison.txt
similarity index 100%
rename from examples/digital/adder-comparison.txt
rename to examples/digital/compare/adder-comparison.txt
diff --git a/examples/digital/adder_Xspice.cir b/examples/digital/compare/adder_Xspice.cir
similarity index 100%
rename from examples/digital/adder_Xspice.cir
rename to examples/digital/compare/adder_Xspice.cir
diff --git a/examples/digital/adder_behav.cir b/examples/digital/compare/adder_behav.cir
similarity index 100%
rename from examples/digital/adder_behav.cir
rename to examples/digital/compare/adder_behav.cir
diff --git a/examples/digital/adder_bip.cir b/examples/digital/compare/adder_bip.cir
similarity index 100%
rename from examples/digital/adder_bip.cir
rename to examples/digital/compare/adder_bip.cir
diff --git a/examples/digital/adder_common.inc b/examples/digital/compare/adder_common.inc
similarity index 100%
rename from examples/digital/adder_common.inc
rename to examples/digital/compare/adder_common.inc
diff --git a/examples/digital/adder_mos.cir b/examples/digital/compare/adder_mos.cir
similarity index 100%
rename from examples/digital/adder_mos.cir
rename to examples/digital/compare/adder_mos.cir
diff --git a/examples/digital/nggtk.tcl b/examples/digital/compare/nggtk.tcl
similarity index 100%
rename from examples/digital/nggtk.tcl
rename to examples/digital/compare/nggtk.tcl
diff --git a/examples/p-to-n-examples/behav-283-1.cir b/examples/digital/digital_devices/behav-283-1.cir
similarity index 100%
rename from examples/p-to-n-examples/behav-283-1.cir
rename to examples/digital/digital_devices/behav-283-1.cir
diff --git a/examples/p-to-n-examples/behav-283-1.stim b/examples/digital/digital_devices/behav-283-1.stim
similarity index 100%
rename from examples/p-to-n-examples/behav-283-1.stim
rename to examples/digital/digital_devices/behav-283-1.stim
diff --git a/examples/p-to-n-examples/behav-283.cir b/examples/digital/digital_devices/behav-283.cir
similarity index 100%
rename from examples/p-to-n-examples/behav-283.cir
rename to examples/digital/digital_devices/behav-283.cir
diff --git a/examples/p-to-n-examples/behav-tristate-pulse.cir b/examples/digital/digital_devices/behav-tristate-pulse.cir
similarity index 100%
rename from examples/p-to-n-examples/behav-tristate-pulse.cir
rename to examples/digital/digital_devices/behav-tristate-pulse.cir
diff --git a/examples/p-to-n-examples/behav-tristate-pulse.stim b/examples/digital/digital_devices/behav-tristate-pulse.stim
similarity index 100%
rename from examples/p-to-n-examples/behav-tristate-pulse.stim
rename to examples/digital/digital_devices/behav-tristate-pulse.stim
diff --git a/examples/p-to-n-examples/behav-tristate.cir b/examples/digital/digital_devices/behav-tristate.cir
similarity index 100%
rename from examples/p-to-n-examples/behav-tristate.cir
rename to examples/digital/digital_devices/behav-tristate.cir
diff --git a/examples/p-to-n-examples/behav-tristate.stim b/examples/digital/digital_devices/behav-tristate.stim
similarity index 100%
rename from examples/p-to-n-examples/behav-tristate.stim
rename to examples/digital/digital_devices/behav-tristate.stim
diff --git a/examples/p-to-n-examples/counter.cir b/examples/digital/digital_devices/counter.cir
similarity index 100%
rename from examples/p-to-n-examples/counter.cir
rename to examples/digital/digital_devices/counter.cir
diff --git a/examples/p-to-n-examples/decoder.cir b/examples/digital/digital_devices/decoder.cir
similarity index 100%
rename from examples/p-to-n-examples/decoder.cir
rename to examples/digital/digital_devices/decoder.cir
diff --git a/examples/p-to-n-examples/decoder.stim b/examples/digital/digital_devices/decoder.stim
similarity index 100%
rename from examples/p-to-n-examples/decoder.stim
rename to examples/digital/digital_devices/decoder.stim
diff --git a/examples/p-to-n-examples/ex283.cir b/examples/digital/digital_devices/ex283.cir
similarity index 100%
rename from examples/p-to-n-examples/ex283.cir
rename to examples/digital/digital_devices/ex283.cir
diff --git a/examples/p-to-n-examples/ex283.stim b/examples/digital/digital_devices/ex283.stim
similarity index 100%
rename from examples/p-to-n-examples/ex283.stim
rename to examples/digital/digital_devices/ex283.stim
diff --git a/examples/p-to-n-examples/ex4.cir b/examples/digital/digital_devices/ex4.cir
similarity index 100%
rename from examples/p-to-n-examples/ex4.cir
rename to examples/digital/digital_devices/ex4.cir
diff --git a/examples/p-to-n-examples/ex4.stim b/examples/digital/digital_devices/ex4.stim
similarity index 100%
rename from examples/p-to-n-examples/ex4.stim
rename to examples/digital/digital_devices/ex4.stim
diff --git a/examples/p-to-n-examples/ex5.cir b/examples/digital/digital_devices/ex5.cir
similarity index 100%
rename from examples/p-to-n-examples/ex5.cir
rename to examples/digital/digital_devices/ex5.cir
diff --git a/examples/p-to-n-examples/ex5.stim b/examples/digital/digital_devices/ex5.stim
similarity index 100%
rename from examples/p-to-n-examples/ex5.stim
rename to examples/digital/digital_devices/ex5.stim
diff --git a/examples/p-to-n-examples/nggtk.tcl b/examples/digital/digital_devices/nggtk.tcl
similarity index 100%
rename from examples/p-to-n-examples/nggtk.tcl
rename to examples/digital/digital_devices/nggtk.tcl
diff --git a/examples/p-to-n-examples/xspice_c4.cir b/examples/digital/digital_devices/xspice_c4.cir
similarity index 100%
rename from examples/p-to-n-examples/xspice_c4.cir
rename to examples/digital/digital_devices/xspice_c4.cir