diff --git a/examples/Threading/Demo_Shared_Counter/Consumer.inot b/examples/Threading_Basics/Shared_Counter/Consumer.inot
similarity index 100%
rename from examples/Threading/Demo_Shared_Counter/Consumer.inot
rename to examples/Threading_Basics/Shared_Counter/Consumer.inot
diff --git a/examples/Threading/Demo_Shared_Counter/Producer.inot b/examples/Threading_Basics/Shared_Counter/Producer.inot
similarity index 100%
rename from examples/Threading/Demo_Shared_Counter/Producer.inot
rename to examples/Threading_Basics/Shared_Counter/Producer.inot
diff --git a/examples/Threading/Demo_Shared_Counter/SharedVariables.h b/examples/Threading_Basics/Shared_Counter/SharedVariables.h
similarity index 100%
rename from examples/Threading/Demo_Shared_Counter/SharedVariables.h
rename to examples/Threading_Basics/Shared_Counter/SharedVariables.h
diff --git a/examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino b/examples/Threading_Basics/Shared_Counter/Shared_Counter.ino
similarity index 100%
rename from examples/Threading/Demo_Shared_Counter/Demo_Shared_Counter.ino
rename to examples/Threading_Basics/Shared_Counter/Shared_Counter.ino
diff --git a/examples/Threading/Demo_Source_Sink_Counter/Consumer.inot b/examples/Threading_Basics/Source_Sink_Counter/Consumer.inot
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_Counter/Consumer.inot
rename to examples/Threading_Basics/Source_Sink_Counter/Consumer.inot
diff --git a/examples/Threading/Demo_Source_Sink_Counter/Producer.inot b/examples/Threading_Basics/Source_Sink_Counter/Producer.inot
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_Counter/Producer.inot
rename to examples/Threading_Basics/Source_Sink_Counter/Producer.inot
diff --git a/examples/Threading/Demo_Source_Sink_Counter/SharedVariables.h b/examples/Threading_Basics/Source_Sink_Counter/SharedVariables.h
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_Counter/SharedVariables.h
rename to examples/Threading_Basics/Source_Sink_Counter/SharedVariables.h
diff --git a/examples/Threading/Demo_Source_Sink_Counter/Demo_Source_Sink_Counter.ino b/examples/Threading_Basics/Source_Sink_Counter/Source_Sink_Counter.ino
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_Counter/Demo_Source_Sink_Counter.ino
rename to examples/Threading_Basics/Source_Sink_Counter/Source_Sink_Counter.ino
diff --git a/examples/Threading/Demo_Source_Sink_LED/SharedVariables.h b/examples/Threading_Basics/Source_Sink_LED/SharedVariables.h
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_LED/SharedVariables.h
rename to examples/Threading_Basics/Source_Sink_LED/SharedVariables.h
diff --git a/examples/Threading/Demo_Source_Sink_LED/Sink_Thread.inot b/examples/Threading_Basics/Source_Sink_LED/Sink_Thread.inot
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_LED/Sink_Thread.inot
rename to examples/Threading_Basics/Source_Sink_LED/Sink_Thread.inot
diff --git a/examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino b/examples/Threading_Basics/Source_Sink_LED/Source_Sink_LED.ino
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_LED/Demo_Source_Sink_LED.ino
rename to examples/Threading_Basics/Source_Sink_LED/Source_Sink_LED.ino
diff --git a/examples/Threading/Demo_Source_Sink_LED/Source_Thread.inot b/examples/Threading_Basics/Source_Sink_LED/Source_Thread.inot
similarity index 100%
rename from examples/Threading/Demo_Source_Sink_LED/Source_Thread.inot
rename to examples/Threading_Basics/Source_Sink_LED/Source_Thread.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino b/examples/Threadsafe_IO/SPI/SPI.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_SPI/Threadsafe_SPI.ino
rename to examples/Threadsafe_IO/SPI/SPI.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino b/examples/Threadsafe_IO/SPI_BusIO/SPI_BusIO.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_SPI_BusIO/Threadsafe_SPI_BusIO.ino
rename to examples/Threadsafe_IO/SPI_BusIO/SPI_BusIO.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino b/examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Serial_GlobalPrefixSuffix.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Threadsafe_Serial_GlobalPrefixSuffix.ino
rename to examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Serial_GlobalPrefixSuffix.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/SharedVariables.h b/examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/SharedVariables.h
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/SharedVariables.h
rename to examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/SharedVariables.h
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_1.inot b/examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_1.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_1.inot
rename to examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_1.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_2.inot b/examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_2.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_2.inot
rename to examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_2.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_3.inot b/examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_3.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_GlobalPrefixSuffix/Thread_3.inot
rename to examples/Threadsafe_IO/Serial_GlobalPrefixSuffix/Thread_3.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/GPS_Thread.inot b/examples/Threadsafe_IO/Serial_ProtocolWrapping/GPS_Thread.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/GPS_Thread.inot
rename to examples/Threadsafe_IO/Serial_ProtocolWrapping/GPS_Thread.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino b/examples/Threadsafe_IO/Serial_ProtocolWrapping/Serial_ProtocolWrapping.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/Threadsafe_Serial_ProtocolWrapping.ino
rename to examples/Threadsafe_IO/Serial_ProtocolWrapping/Serial_ProtocolWrapping.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/SharedVariables.h b/examples/Threadsafe_IO/Serial_ProtocolWrapping/SharedVariables.h
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_ProtocolWrapping/SharedVariables.h
rename to examples/Threadsafe_IO/Serial_ProtocolWrapping/SharedVariables.h
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino b/examples/Threadsafe_IO/Serial_Reader/Serial_Reader.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Reader/Threadsafe_Serial_Reader.ino
rename to examples/Threadsafe_IO/Serial_Reader/Serial_Reader.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Reader/SharedVariables.h b/examples/Threadsafe_IO/Serial_Reader/SharedVariables.h
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Reader/SharedVariables.h
rename to examples/Threadsafe_IO/Serial_Reader/SharedVariables.h
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_1.inot b/examples/Threadsafe_IO/Serial_Reader/Thread_1.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_1.inot
rename to examples/Threadsafe_IO/Serial_Reader/Thread_1.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_2.inot b/examples/Threadsafe_IO/Serial_Reader/Thread_2.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_2.inot
rename to examples/Threadsafe_IO/Serial_Reader/Thread_2.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_3.inot b/examples/Threadsafe_IO/Serial_Reader/Thread_3.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Reader/Thread_3.inot
rename to examples/Threadsafe_IO/Serial_Reader/Thread_3.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino b/examples/Threadsafe_IO/Serial_Writer/Serial_Writer.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Writer/Threadsafe_Serial_Writer.ino
rename to examples/Threadsafe_IO/Serial_Writer/Serial_Writer.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Writer/SharedVariables.h b/examples/Threadsafe_IO/Serial_Writer/SharedVariables.h
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Writer/SharedVariables.h
rename to examples/Threadsafe_IO/Serial_Writer/SharedVariables.h
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_1.inot b/examples/Threadsafe_IO/Serial_Writer/Thread_1.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_1.inot
rename to examples/Threadsafe_IO/Serial_Writer/Thread_1.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_2.inot b/examples/Threadsafe_IO/Serial_Writer/Thread_2.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_2.inot
rename to examples/Threadsafe_IO/Serial_Writer/Thread_2.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_3.inot b/examples/Threadsafe_IO/Serial_Writer/Thread_3.inot
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Serial_Writer/Thread_3.inot
rename to examples/Threadsafe_IO/Serial_Writer/Thread_3.inot
diff --git a/examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino b/examples/Threadsafe_IO/Wire/Wire.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Wire/Threadsafe_Wire.ino
rename to examples/Threadsafe_IO/Wire/Wire.ino
diff --git a/examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino b/examples/Threadsafe_IO/Wire_BusIO/Wire_BusIO.ino
similarity index 100%
rename from examples/Threadsafe_IO/Threadsafe_Wire_BusIO/Threadsafe_Wire_BusIO.ino
rename to examples/Threadsafe_IO/Wire_BusIO/Wire_BusIO.ino