diff --git a/examples/Basic/1-SimpleLightBulb/1-SimpleLightBulb.ino b/examples/Tutorials/A-Basic/01-SimpleLightBulb/01-SimpleLightBulb.ino
similarity index 100%
rename from examples/Basic/1-SimpleLightBulb/1-SimpleLightBulb.ino
rename to examples/Tutorials/A-Basic/01-SimpleLightBulb/01-SimpleLightBulb.ino
diff --git a/examples/Basic/2-TwoSimpleLightBulbs/2-TwoSimpleLightBulbs.ino b/examples/Tutorials/A-Basic/02-TwoSimpleLightBulbs/02-TwoSimpleLightBulbs.ino
similarity index 100%
rename from examples/Basic/2-TwoSimpleLightBulbs/2-TwoSimpleLightBulbs.ino
rename to examples/Tutorials/A-Basic/02-TwoSimpleLightBulbs/02-TwoSimpleLightBulbs.ino
diff --git a/examples/Basic/3-CeilingFanWithLight/3-CeilingFanWithLight.ino b/examples/Tutorials/A-Basic/03-CeilingFanWithLight/03-CeilingFanWithLight.ino
similarity index 100%
rename from examples/Basic/3-CeilingFanWithLight/3-CeilingFanWithLight.ino
rename to examples/Tutorials/A-Basic/03-CeilingFanWithLight/03-CeilingFanWithLight.ino
diff --git a/examples/Basic/4-AdvancedCeilingFan/4-AdvancedCeilingFan.ino b/examples/Tutorials/A-Basic/04-AdvancedCeilingFan/04-AdvancedCeilingFan.ino
similarity index 100%
rename from examples/Basic/4-AdvancedCeilingFan/4-AdvancedCeilingFan.ino
rename to examples/Tutorials/A-Basic/04-AdvancedCeilingFan/04-AdvancedCeilingFan.ino
diff --git a/examples/Intermediate/5-WorkingLED/5-WorkingLED.ino b/examples/Tutorials/B-Intermediate/05-WorkingLED/05-WorkingLED.ino
similarity index 100%
rename from examples/Intermediate/5-WorkingLED/5-WorkingLED.ino
rename to examples/Tutorials/B-Intermediate/05-WorkingLED/05-WorkingLED.ino
diff --git a/examples/Intermediate/5-WorkingLED/DEV_LED.h b/examples/Tutorials/B-Intermediate/05-WorkingLED/DEV_LED.h
similarity index 100%
rename from examples/Intermediate/5-WorkingLED/DEV_LED.h
rename to examples/Tutorials/B-Intermediate/05-WorkingLED/DEV_LED.h
diff --git a/examples/Intermediate/6-DimmableLED/6-DimmableLED.ino b/examples/Tutorials/B-Intermediate/06-DimmableLED/06-DimmableLED.ino
similarity index 100%
rename from examples/Intermediate/6-DimmableLED/6-DimmableLED.ino
rename to examples/Tutorials/B-Intermediate/06-DimmableLED/06-DimmableLED.ino
diff --git a/examples/Intermediate/6-DimmableLED/DEV_LED.h b/examples/Tutorials/B-Intermediate/06-DimmableLED/DEV_LED.h
similarity index 100%
rename from examples/Intermediate/6-DimmableLED/DEV_LED.h
rename to examples/Tutorials/B-Intermediate/06-DimmableLED/DEV_LED.h
diff --git a/examples/Intermediate/7-IdentifyRoutines/7-IdentifyRoutines.ino b/examples/Tutorials/B-Intermediate/07-IdentifyRoutines/07-IdentifyRoutines.ino
similarity index 100%
rename from examples/Intermediate/7-IdentifyRoutines/7-IdentifyRoutines.ino
rename to examples/Tutorials/B-Intermediate/07-IdentifyRoutines/07-IdentifyRoutines.ino
diff --git a/examples/Intermediate/7-IdentifyRoutines/DEV_Identify.h b/examples/Tutorials/B-Intermediate/07-IdentifyRoutines/DEV_Identify.h
similarity index 100%
rename from examples/Intermediate/7-IdentifyRoutines/DEV_Identify.h
rename to examples/Tutorials/B-Intermediate/07-IdentifyRoutines/DEV_Identify.h
diff --git a/examples/Advanced/8-Bridges/DEV_LED.h b/examples/Tutorials/B-Intermediate/07-IdentifyRoutines/DEV_LED.h
similarity index 100%
rename from examples/Advanced/8-Bridges/DEV_LED.h
rename to examples/Tutorials/B-Intermediate/07-IdentifyRoutines/DEV_LED.h
diff --git a/examples/Advanced/8-Bridges/8-Bridges.ino b/examples/Tutorials/C-Advanced/08-Bridges/08-Bridges.ino
similarity index 100%
rename from examples/Advanced/8-Bridges/8-Bridges.ino
rename to examples/Tutorials/C-Advanced/08-Bridges/08-Bridges.ino
diff --git a/examples/Advanced/10-RGB_LED/DEV_Identify.h b/examples/Tutorials/C-Advanced/08-Bridges/DEV_Identify.h
similarity index 100%
rename from examples/Advanced/10-RGB_LED/DEV_Identify.h
rename to examples/Tutorials/C-Advanced/08-Bridges/DEV_Identify.h
diff --git a/examples/Intermediate/7-IdentifyRoutines/DEV_LED.h b/examples/Tutorials/C-Advanced/08-Bridges/DEV_LED.h
similarity index 100%
rename from examples/Intermediate/7-IdentifyRoutines/DEV_LED.h
rename to examples/Tutorials/C-Advanced/08-Bridges/DEV_LED.h
diff --git a/examples/Advanced/9-MessageLogging/9-MessageLogging.ino b/examples/Tutorials/C-Advanced/09-MessageLogging/09-MessageLogging.ino
similarity index 100%
rename from examples/Advanced/9-MessageLogging/9-MessageLogging.ino
rename to examples/Tutorials/C-Advanced/09-MessageLogging/09-MessageLogging.ino
diff --git a/examples/Advanced/8-Bridges/DEV_Identify.h b/examples/Tutorials/C-Advanced/09-MessageLogging/DEV_Identify.h
similarity index 100%
rename from examples/Advanced/8-Bridges/DEV_Identify.h
rename to examples/Tutorials/C-Advanced/09-MessageLogging/DEV_Identify.h
diff --git a/examples/Advanced/9-MessageLogging/DEV_LED.h b/examples/Tutorials/C-Advanced/09-MessageLogging/DEV_LED.h
similarity index 100%
rename from examples/Advanced/9-MessageLogging/DEV_LED.h
rename to examples/Tutorials/C-Advanced/09-MessageLogging/DEV_LED.h
diff --git a/examples/Advanced/10-RGB_LED/10-RGB_LED.ino b/examples/Tutorials/C-Advanced/10-RGB_LED/10-RGB_LED.ino
similarity index 100%
rename from examples/Advanced/10-RGB_LED/10-RGB_LED.ino
rename to examples/Tutorials/C-Advanced/10-RGB_LED/10-RGB_LED.ino
diff --git a/examples/Advanced/9-MessageLogging/DEV_Identify.h b/examples/Tutorials/C-Advanced/10-RGB_LED/DEV_Identify.h
similarity index 100%
rename from examples/Advanced/9-MessageLogging/DEV_Identify.h
rename to examples/Tutorials/C-Advanced/10-RGB_LED/DEV_Identify.h
diff --git a/examples/Advanced/10-RGB_LED/DEV_LED.h b/examples/Tutorials/C-Advanced/10-RGB_LED/DEV_LED.h
similarity index 100%
rename from examples/Advanced/10-RGB_LED/DEV_LED.h
rename to examples/Tutorials/C-Advanced/10-RGB_LED/DEV_LED.h
diff --git a/examples/Advanced/11-ServiceOptions/11-ServiceOptions.ino b/examples/Tutorials/C-Advanced/11-ServiceOptions/11-ServiceOptions.ino
similarity index 100%
rename from examples/Advanced/11-ServiceOptions/11-ServiceOptions.ino
rename to examples/Tutorials/C-Advanced/11-ServiceOptions/11-ServiceOptions.ino
diff --git a/examples/Advanced/11-ServiceOptions/DEV_Identify.h b/examples/Tutorials/C-Advanced/11-ServiceOptions/DEV_Identify.h
similarity index 100%
rename from examples/Advanced/11-ServiceOptions/DEV_Identify.h
rename to examples/Tutorials/C-Advanced/11-ServiceOptions/DEV_Identify.h
diff --git a/examples/Advanced/11-ServiceOptions/DEV_LED.h b/examples/Tutorials/C-Advanced/11-ServiceOptions/DEV_LED.h
similarity index 100%
rename from examples/Advanced/11-ServiceOptions/DEV_LED.h
rename to examples/Tutorials/C-Advanced/11-ServiceOptions/DEV_LED.h
diff --git a/examples/Expert/12-ServiceLoops/12-ServiceLoops.ino b/examples/Tutorials/D-Expert/12-ServiceLoops/12-ServiceLoops.ino
similarity index 100%
rename from examples/Expert/12-ServiceLoops/12-ServiceLoops.ino
rename to examples/Tutorials/D-Expert/12-ServiceLoops/12-ServiceLoops.ino
diff --git a/examples/Expert/12-ServiceLoops/DEV_Identify.h b/examples/Tutorials/D-Expert/12-ServiceLoops/DEV_Identify.h
similarity index 100%
rename from examples/Expert/12-ServiceLoops/DEV_Identify.h
rename to examples/Tutorials/D-Expert/12-ServiceLoops/DEV_Identify.h
diff --git a/examples/Expert/12-ServiceLoops/DEV_Sensors.h b/examples/Tutorials/D-Expert/12-ServiceLoops/DEV_Sensors.h
similarity index 100%
rename from examples/Expert/12-ServiceLoops/DEV_Sensors.h
rename to examples/Tutorials/D-Expert/12-ServiceLoops/DEV_Sensors.h
diff --git a/examples/Expert/13-TargetStates/13-TargetStates.ino b/examples/Tutorials/D-Expert/13-TargetStates/13-TargetStates.ino
similarity index 100%
rename from examples/Expert/13-TargetStates/13-TargetStates.ino
rename to examples/Tutorials/D-Expert/13-TargetStates/13-TargetStates.ino
diff --git a/examples/Expert/13-TargetStates/DEV_DoorsWindows.h b/examples/Tutorials/D-Expert/13-TargetStates/DEV_DoorsWindows.h
similarity index 100%
rename from examples/Expert/13-TargetStates/DEV_DoorsWindows.h
rename to examples/Tutorials/D-Expert/13-TargetStates/DEV_DoorsWindows.h
diff --git a/examples/Expert/13-TargetStates/DEV_Identify.h b/examples/Tutorials/D-Expert/13-TargetStates/DEV_Identify.h
similarity index 100%
rename from examples/Expert/13-TargetStates/DEV_Identify.h
rename to examples/Tutorials/D-Expert/13-TargetStates/DEV_Identify.h
diff --git a/examples/Expert/14-EmulatedPushButtons/14-EmulatedPushButtons.ino b/examples/Tutorials/D-Expert/14-EmulatedPushButtons/14-EmulatedPushButtons.ino
similarity index 100%
rename from examples/Expert/14-EmulatedPushButtons/14-EmulatedPushButtons.ino
rename to examples/Tutorials/D-Expert/14-EmulatedPushButtons/14-EmulatedPushButtons.ino
diff --git a/examples/Expert/14-EmulatedPushButtons/DEV_Blinker.h b/examples/Tutorials/D-Expert/14-EmulatedPushButtons/DEV_Blinker.h
similarity index 100%
rename from examples/Expert/14-EmulatedPushButtons/DEV_Blinker.h
rename to examples/Tutorials/D-Expert/14-EmulatedPushButtons/DEV_Blinker.h
diff --git a/examples/Expert/14-EmulatedPushButtons/DEV_Identify.h b/examples/Tutorials/D-Expert/14-EmulatedPushButtons/DEV_Identify.h
similarity index 100%
rename from examples/Expert/14-EmulatedPushButtons/DEV_Identify.h
rename to examples/Tutorials/D-Expert/14-EmulatedPushButtons/DEV_Identify.h