diff --git a/Tutorial_1_BasicControl/Resources/BasicControl.htm b/Tutorial_1_BasicControl/BasicControl.htm
similarity index 100%
rename from Tutorial_1_BasicControl/Resources/BasicControl.htm
rename to Tutorial_1_BasicControl/BasicControl.htm
diff --git a/Tutorial_1_BasicControl/Classes/BasicControl.xpp b/Tutorial_1_BasicControl/BasicControl.xpp
similarity index 100%
rename from Tutorial_1_BasicControl/Classes/BasicControl.xpp
rename to Tutorial_1_BasicControl/BasicControl.xpp
diff --git a/Tutorial_1_BasicControl/Forms/BasicControlForm.xpp b/Tutorial_1_BasicControl/BasicControlForm.xpp
similarity index 100%
rename from Tutorial_1_BasicControl/Forms/BasicControlForm.xpp
rename to Tutorial_1_BasicControl/BasicControlForm.xpp
diff --git a/Tutorial_2_BasicValueControl/Resources/BasicValueControl.htm b/Tutorial_2_BasicValueControl/BasicValueControl.htm
similarity index 100%
rename from Tutorial_2_BasicValueControl/Resources/BasicValueControl.htm
rename to Tutorial_2_BasicValueControl/BasicValueControl.htm
diff --git a/Tutorial_2_BasicValueControl/Classes/BasicValueControl.xpp b/Tutorial_2_BasicValueControl/BasicValueControl.xpp
similarity index 100%
rename from Tutorial_2_BasicValueControl/Classes/BasicValueControl.xpp
rename to Tutorial_2_BasicValueControl/BasicValueControl.xpp
diff --git a/Tutorial_2_BasicValueControl/Forms/BasicValueControlForm.xpp b/Tutorial_2_BasicValueControl/BasicValueControlForm.xpp
similarity index 100%
rename from Tutorial_2_BasicValueControl/Forms/BasicValueControlForm.xpp
rename to Tutorial_2_BasicValueControl/BasicValueControlForm.xpp
diff --git a/Tutorial_3_BasicActionControl/Resources/BasicActionControl.htm b/Tutorial_3_BasicActionControl/BasicActionControl.htm
similarity index 100%
rename from Tutorial_3_BasicActionControl/Resources/BasicActionControl.htm
rename to Tutorial_3_BasicActionControl/BasicActionControl.htm
diff --git a/Tutorial_3_BasicActionControl/Resources/BasicActionControl.js b/Tutorial_3_BasicActionControl/BasicActionControl.js
similarity index 100%
rename from Tutorial_3_BasicActionControl/Resources/BasicActionControl.js
rename to Tutorial_3_BasicActionControl/BasicActionControl.js
diff --git a/Tutorial_3_BasicActionControl/Classes/BasicActionControl.xpp b/Tutorial_3_BasicActionControl/BasicActionControl.xpp
similarity index 100%
rename from Tutorial_3_BasicActionControl/Classes/BasicActionControl.xpp
rename to Tutorial_3_BasicActionControl/BasicActionControl.xpp
diff --git a/Tutorial_3_BasicActionControl/Forms/BasicActionControlForm.xpp b/Tutorial_3_BasicActionControl/BasicActionControlForm.xpp
similarity index 100%
rename from Tutorial_3_BasicActionControl/Forms/BasicActionControlForm.xpp
rename to Tutorial_3_BasicActionControl/BasicActionControlForm.xpp
diff --git a/Tutorial_3_BasicActionControl/Classes/BuildBasicActionControl.xpp b/Tutorial_3_BasicActionControl/BuildBasicActionControl.xpp
similarity index 100%
rename from Tutorial_3_BasicActionControl/Classes/BuildBasicActionControl.xpp
rename to Tutorial_3_BasicActionControl/BuildBasicActionControl.xpp
diff --git a/Tutorial_4_BasicUserEntryControl/Resources/BasicUserEntryControl.htm b/Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.htm
similarity index 100%
rename from Tutorial_4_BasicUserEntryControl/Resources/BasicUserEntryControl.htm
rename to Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.htm
diff --git a/Tutorial_4_BasicUserEntryControl/Resources/BasicUserEntryControl.js b/Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.js
similarity index 100%
rename from Tutorial_4_BasicUserEntryControl/Resources/BasicUserEntryControl.js
rename to Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.js
diff --git a/Tutorial_4_BasicUserEntryControl/Classes/BasicUserEntryControl.xpp b/Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.xpp
similarity index 100%
rename from Tutorial_4_BasicUserEntryControl/Classes/BasicUserEntryControl.xpp
rename to Tutorial_4_BasicUserEntryControl/BasicUserEntryControl.xpp
diff --git a/Tutorial_4_BasicUserEntryControl/Forms/BasicUserEntryControlForm.xpp b/Tutorial_4_BasicUserEntryControl/BasicUserEntryControlForm.xpp
similarity index 100%
rename from Tutorial_4_BasicUserEntryControl/Forms/BasicUserEntryControlForm.xpp
rename to Tutorial_4_BasicUserEntryControl/BasicUserEntryControlForm.xpp