diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index 4cd0f040..39200a33 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -110,15 +110,15 @@ Section "Grafx2" SecProgram
   File ..\share\grafx2\skins\*.png
   # SetOverwrite cannot be skipped by control flow instructions
   # see https://nsis.sourceforge.io/Docs/Chapter4.html#flags
-  SetOutPath "$INSTDIR\share\grafx2\scripts\samples_2.4"
-  IfFileExists "$INSTDIR\share\grafx2\scripts\samples_2.4\*.*" 0 overwritesamples
-  MessageBox MB_YESNO "Do you want to overwrite the scripts\samples_2.4 directory ?" /SD IDYES IDYES overwritesamples
+  SetOutPath "$INSTDIR\share\grafx2\scripts\samples"
+  IfFileExists "$INSTDIR\share\grafx2\scripts\samples\*.*" 0 overwritesamples
+  MessageBox MB_YESNO "Do you want to overwrite the scripts\samples directory ?" /SD IDYES IDYES overwritesamples
     SetOverwrite off
-    File /r ..\share\grafx2\scripts\samples_2.4\*.*
+    File /r ..\share\grafx2\scripts\samples\*.*
     SetOverwrite on
     Goto +2
   overwritesamples:
-  File /r ..\share\grafx2\scripts\samples_2.4\*.*
+  File /r ..\share\grafx2\scripts\samples\*.*
   SetOutPath "$INSTDIR\doc"
   File ..\doc\*.txt
   SetOutPath "$INSTDIR\share\grafx2\fonts"
@@ -215,7 +215,7 @@ Section "un.SecProgram"
   RMDir /r "$INSTDIR\doc"
   RMDir /r "$INSTDIR\share\grafx2\fonts"
   RMDir /r "$INSTDIR\share\grafx2\skins"
-  RMDir /r "$INSTDIR\share\grafx2\scripts\samples_2.4"
+  RMDir /r "$INSTDIR\share\grafx2\scripts\samples"
   RMDir  "$INSTDIR\share\grafx2\scripts"
   RMDir  "$INSTDIR\share\grafx2"
   RMDir  "$INSTDIR\share"
diff --git a/share/grafx2/scripts/samples_2.4/brush/ApplyColor.lua b/share/grafx2/scripts/samples/brush/ApplyColor.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/ApplyColor.lua
rename to share/grafx2/scripts/samples/brush/ApplyColor.lua
diff --git a/share/grafx2/scripts/samples_2.4/brush/Fisheye.lua b/share/grafx2/scripts/samples/brush/Fisheye.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/Fisheye.lua
rename to share/grafx2/scripts/samples/brush/Fisheye.lua
diff --git a/share/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua b/share/grafx2/scripts/samples/brush/GrayscaleAvg.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua
rename to share/grafx2/scripts/samples/brush/GrayscaleAvg.lua
diff --git a/share/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua b/share/grafx2/scripts/samples/brush/GrayscaleDesat.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua
rename to share/grafx2/scripts/samples/brush/GrayscaleDesat.lua
diff --git a/share/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua b/share/grafx2/scripts/samples/brush/Halfsmooth.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua
rename to share/grafx2/scripts/samples/brush/Halfsmooth.lua
diff --git a/share/grafx2/scripts/samples_2.4/brush/Waves.lua b/share/grafx2/scripts/samples/brush/Waves.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/brush/Waves.lua
rename to share/grafx2/scripts/samples/brush/Waves.lua
diff --git a/share/grafx2/scripts/samples_2.4/codenetsend.lua b/share/grafx2/scripts/samples/codenetsend.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/codenetsend.lua
rename to share/grafx2/scripts/samples/codenetsend.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/3DPalette.lua b/share/grafx2/scripts/samples/demo/3DPalette.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/3DPalette.lua
rename to share/grafx2/scripts/samples/demo/3DPalette.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/Ellipse.lua b/share/grafx2/scripts/samples/demo/Ellipse.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/Ellipse.lua
rename to share/grafx2/scripts/samples/demo/Ellipse.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/FlipPicture.lua b/share/grafx2/scripts/samples/demo/FlipPicture.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/FlipPicture.lua
rename to share/grafx2/scripts/samples/demo/FlipPicture.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua b/share/grafx2/scripts/samples/demo/SierpinskyCarpet.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua
rename to share/grafx2/scripts/samples/demo/SierpinskyCarpet.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua b/share/grafx2/scripts/samples/demo/SierpinskyTriangle.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua
rename to share/grafx2/scripts/samples/demo/SierpinskyTriangle.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/Spritesheet.lua b/share/grafx2/scripts/samples/demo/Spritesheet.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/Spritesheet.lua
rename to share/grafx2/scripts/samples/demo/Spritesheet.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua b/share/grafx2/scripts/samples/demo/brush/Amigaball.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua
rename to share/grafx2/scripts/samples/demo/brush/Amigaball.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua b/share/grafx2/scripts/samples/demo/brush/ColorSphere.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua
rename to share/grafx2/scripts/samples/demo/brush/ColorSphere.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua b/share/grafx2/scripts/samples/demo/brush/FindAA.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua
rename to share/grafx2/scripts/samples/demo/brush/FindAA.lua
diff --git a/share/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua b/share/grafx2/scripts/samples/demo/brush/Mandelbrot.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua
rename to share/grafx2/scripts/samples/demo/brush/Mandelbrot.lua
diff --git a/share/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua b/share/grafx2/scripts/samples/libs/dawnbringer_lib.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua
rename to share/grafx2/scripts/samples/libs/dawnbringer_lib.lua
diff --git a/share/grafx2/scripts/samples_2.4/libs/memory.lua b/share/grafx2/scripts/samples/libs/memory.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/libs/memory.lua
rename to share/grafx2/scripts/samples/libs/memory.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/Desaturate.lua b/share/grafx2/scripts/samples/palette/Desaturate.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/Desaturate.lua
rename to share/grafx2/scripts/samples/palette/Desaturate.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/ExpandColors.lua b/share/grafx2/scripts/samples/palette/ExpandColors.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/ExpandColors.lua
rename to share/grafx2/scripts/samples/palette/ExpandColors.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/FillColorCube.lua b/share/grafx2/scripts/samples/palette/FillColorCube.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/FillColorCube.lua
rename to share/grafx2/scripts/samples/palette/FillColorCube.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua b/share/grafx2/scripts/samples/palette/InvertedRGB.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua
rename to share/grafx2/scripts/samples/palette/InvertedRGB.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/Set3bit.lua b/share/grafx2/scripts/samples/palette/Set3bit.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/Set3bit.lua
rename to share/grafx2/scripts/samples/palette/Set3bit.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/Set6bit.lua b/share/grafx2/scripts/samples/palette/Set6bit.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/Set6bit.lua
rename to share/grafx2/scripts/samples/palette/Set6bit.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua b/share/grafx2/scripts/samples/palette/SetC64Palette.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua
rename to share/grafx2/scripts/samples/palette/SetC64Palette.lua
diff --git a/share/grafx2/scripts/samples_2.4/palette/ShiftHue.lua b/share/grafx2/scripts/samples/palette/ShiftHue.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/palette/ShiftHue.lua
rename to share/grafx2/scripts/samples/palette/ShiftHue.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua b/share/grafx2/scripts/samples/picture/CellColourReducer.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua
rename to share/grafx2/scripts/samples/picture/CellColourReducer.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua b/share/grafx2/scripts/samples/picture/DrawGridIsometric.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua
rename to share/grafx2/scripts/samples/picture/DrawGridIsometric.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua b/share/grafx2/scripts/samples/picture/DrawGridOrthogonal_RGB.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
rename to share/grafx2/scripts/samples/picture/DrawGridOrthogonal_RGB.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua b/share/grafx2/scripts/samples/picture/DrawgridOrthogonal_Index.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
rename to share/grafx2/scripts/samples/picture/DrawgridOrthogonal_Index.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/FontConvert.lua b/share/grafx2/scripts/samples/picture/FontConvert.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/FontConvert.lua
rename to share/grafx2/scripts/samples/picture/FontConvert.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua b/share/grafx2/scripts/samples/picture/GlassGridFilter.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua
rename to share/grafx2/scripts/samples/picture/GlassGridFilter.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua b/share/grafx2/scripts/samples/picture/PaletteToPicture.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua
rename to share/grafx2/scripts/samples/picture/PaletteToPicture.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua b/share/grafx2/scripts/samples/picture/Pic2isometric.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua
rename to share/grafx2/scripts/samples/picture/Pic2isometric.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua b/share/grafx2/scripts/samples/picture/Rainbow-Dark2Bright.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
rename to share/grafx2/scripts/samples/picture/Rainbow-Dark2Bright.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua b/share/grafx2/scripts/samples/picture/RemapImage2RGB.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua
rename to share/grafx2/scripts/samples/picture/RemapImage2RGB.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua b/share/grafx2/scripts/samples/picture/RemapImage2RGB_ed.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
rename to share/grafx2/scripts/samples/picture/RemapImage2RGB_ed.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua b/share/grafx2/scripts/samples/picture/RemapImageTo3bitPal.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
rename to share/grafx2/scripts/samples/picture/RemapImageTo3bitPal.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/ThomsonConstraints.lua b/share/grafx2/scripts/samples/picture/ThomsonConstraints.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/ThomsonConstraints.lua
rename to share/grafx2/scripts/samples/picture/ThomsonConstraints.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/Tiler.lua b/share/grafx2/scripts/samples/picture/Tiler.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/Tiler.lua
rename to share/grafx2/scripts/samples/picture/Tiler.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua b/share/grafx2/scripts/samples/picture/XBitColourXpaceFromPalette.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
rename to share/grafx2/scripts/samples/picture/XBitColourXpaceFromPalette.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/others-8bit/lib/ostro_other.lua b/share/grafx2/scripts/samples/picture/others-8bit/lib/ostro_other.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/others-8bit/lib/ostro_other.lua
rename to share/grafx2/scripts/samples/picture/others-8bit/lib/ostro_other.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_oric.lua b/share/grafx2/scripts/samples/picture/others-8bit/ostro_oric.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_oric.lua
rename to share/grafx2/scripts/samples/picture/others-8bit/ostro_oric.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_zx.lua b/share/grafx2/scripts/samples/picture/others-8bit/ostro_zx.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/others-8bit/ostro_zx.lua
rename to share/grafx2/scripts/samples/picture/others-8bit/ostro_zx.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_mo5.lua b/share/grafx2/scripts/samples/picture/thomson/bayer4_mo5.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_mo5.lua
rename to share/grafx2/scripts/samples/picture/thomson/bayer4_mo5.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_to8.lua b/share/grafx2/scripts/samples/picture/thomson/bayer4_to8.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/bayer4_to8.lua
rename to share/grafx2/scripts/samples/picture/thomson/bayer4_to8.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/bayer.lua b/share/grafx2/scripts/samples/picture/thomson/lib/bayer.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/bayer.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/bayer.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/color.lua b/share/grafx2/scripts/samples/picture/thomson/lib/color.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/color.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/color.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/color_reduction.lua b/share/grafx2/scripts/samples/picture/thomson/lib/color_reduction.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/color_reduction.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/color_reduction.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/convex_hull.lua b/share/grafx2/scripts/samples/picture/thomson/lib/convex_hull.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/convex_hull.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/convex_hull.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/ostromoukhov.lua b/share/grafx2/scripts/samples/picture/thomson/lib/ostromoukhov.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/ostromoukhov.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/ostromoukhov.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/lib/thomson.lua b/share/grafx2/scripts/samples/picture/thomson/lib/thomson.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/lib/thomson.lua
rename to share/grafx2/scripts/samples/picture/thomson/lib/thomson.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/none_mo5.lua b/share/grafx2/scripts/samples/picture/thomson/none_mo5.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/none_mo5.lua
rename to share/grafx2/scripts/samples/picture/thomson/none_mo5.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/none_to8.lua b/share/grafx2/scripts/samples/picture/thomson/none_to8.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/none_to8.lua
rename to share/grafx2/scripts/samples/picture/thomson/none_to8.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/none_to9.lua b/share/grafx2/scripts/samples/picture/thomson/none_to9.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/none_to9.lua
rename to share/grafx2/scripts/samples/picture/thomson/none_to9.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/ostro_mo5.lua b/share/grafx2/scripts/samples/picture/thomson/ostro_mo5.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/ostro_mo5.lua
rename to share/grafx2/scripts/samples/picture/thomson/ostro_mo5.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to7.lua b/share/grafx2/scripts/samples/picture/thomson/ostro_to7.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to7.lua
rename to share/grafx2/scripts/samples/picture/thomson/ostro_to7.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to8.lua b/share/grafx2/scripts/samples/picture/thomson/ostro_to8.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to8.lua
rename to share/grafx2/scripts/samples/picture/thomson/ostro_to8.lua
diff --git a/share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to9.lua b/share/grafx2/scripts/samples/picture/thomson/ostro_to9.lua
similarity index 100%
rename from share/grafx2/scripts/samples_2.4/picture/thomson/ostro_to9.lua
rename to share/grafx2/scripts/samples/picture/thomson/ostro_to9.lua
diff --git a/src/Makefile b/src/Makefile
index 934a73f3..fb341848 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -744,7 +744,7 @@ SCRIPTS_PIC_THOMSON = bayer4_mo5.lua bayer4_to8.lua \
                       lib/bayer.lua lib/color.lua lib/color_reduction.lua \
                       lib/convex_hull.lua lib/ostromoukhov.lua \
                       lib/thomson.lua
-SCRIPT_FILES = $(addprefix ../share/grafx2/scripts/samples_2.4/, \
+SCRIPT_FILES = $(addprefix ../share/grafx2/scripts/samples/, \
                  $(addprefix brush/,$(SCRIPTS_BRUSH)) \
                  $(addprefix demo/,$(SCRIPTS_DEMO)) \
                  $(addprefix demo/brush/,$(SCRIPTS_DEMO_BRUSH)) \
@@ -769,12 +769,11 @@ all : $(MACAPPEXE)
 $(MACAPPEXE) : $(BIN)
 	rm -rf Grafx2.app
 	mkdir -p Grafx2.app Grafx2.app/Contents Grafx2.app/Contents/Frameworks Grafx2.app/Contents/MacOS Grafx2.app/Contents/Resources Grafx2.app/Contents/Resources/scripts
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4/brush
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4/demo
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4/libs
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4/palette
-	mkdir -p Grafx2.app/Contents/Resources/scripts/samples_2.4/picture
+	mkdir -p Grafx2.app/Contents/Resources/scripts/samples/brush
+	mkdir -p Grafx2.app/Contents/Resources/scripts/samples/demo
+	mkdir -p Grafx2.app/Contents/Resources/scripts/samples/libs
+	mkdir -p Grafx2.app/Contents/Resources/scripts/samples/palette
+	mkdir -p Grafx2.app/Contents/Resources/scripts/samples/picture
 	echo 'APPL????' > Grafx2.app/Contents/PkgInfo
 	cp Info.plist Grafx2.app/Contents
 	cp Grafx2.icns Grafx2.app/Contents/Resources
@@ -786,11 +785,11 @@ endif
 	cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources
 	cp -r ../share/grafx2/skins Grafx2.app/Contents/Resources
 	cp -r ../share/grafx2/gfx2def.ini Grafx2.app/Contents/Resources
-	cp -r ../share/grafx2/scripts/samples_2.4/brush Grafx2.app/Contents/Resources/scripts/samples_2.4
-	cp -r ../share/grafx2/scripts/samples_2.4/demo Grafx2.app/Contents/Resources/scripts/samples_2.4
-	cp -r ../share/grafx2/scripts/samples_2.4/libs Grafx2.app/Contents/Resources/scripts/samples_2.4
-	cp -r ../share/grafx2/scripts/samples_2.4/palette Grafx2.app/Contents/Resources/scripts/samples_2.4
-	cp -r ../share/grafx2/scripts/samples_2.4/picture Grafx2.app/Contents/Resources/scripts/samples_2.4
+	cp -r ../share/grafx2/scripts/samples/brush Grafx2.app/Contents/Resources/scripts/samples
+	cp -r ../share/grafx2/scripts/samples/demo Grafx2.app/Contents/Resources/scripts/samples
+	cp -r ../share/grafx2/scripts/samples/libs Grafx2.app/Contents/Resources/scripts/samples
+	cp -r ../share/grafx2/scripts/samples/palette Grafx2.app/Contents/Resources/scripts/samples
+	cp -r ../share/grafx2/scripts/samples/picture Grafx2.app/Contents/Resources/scripts/samples
 ifdef MACOSX_LION
 	mkdir -p Grafx2.app/Contents/Frameworks/Lua.framework/Versions
 	cp -Rp $(FWDIR)/Lua.framework/Versions/A Grafx2.app/Contents/Frameworks/Lua.framework/Versions
@@ -968,17 +967,6 @@ install : $(BIN)
 	test -d $(DESTDIR)$(datadir)/grafx2/skins || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/skins
 	test -d $(DESTDIR)$(datadir)/grafx2/scripts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts
 	test -d $(DESTDIR)$(datadir)/grafx2/scripts/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4 || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/brush || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/brush
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo/brush || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo/brush
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit
-	test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib
 	test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications
 	test -d $(DESTDIR)$(datadir)/metainfo || $(MKDIR) $(DESTDIR)$(datadir)/metainfo
 	test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir)
@@ -989,7 +977,10 @@ install : $(BIN)
 	$(CP) ../share/grafx2/gfx2.gif $(DESTDIR)$(datadir)/grafx2/
 	$(CP) ../share/grafx2/fonts/* $(DESTDIR)$(datadir)/grafx2/fonts/
 	$(CP) $(SKIN_FILES) $(DESTDIR)$(datadir)/grafx2/skins/
-	for f in $(SCRIPT_FILES:../share/%=%); do cp "../share/$$f" "$(DESTDIR)$(datadir)/$$f" ; done
+	for f in $(SCRIPT_FILES:../share/%=%); do \
+	  test -d $(DESTDIR)$(datadir)/`dirname $$f` || $(MKDIR) $(DESTDIR)$(datadir)/`dirname $$f` ; \
+	  $(CP) "../share/$$f" "$(DESTDIR)$(datadir)/$$f" ; \
+	done
 	# Icon and desktop file for debian
 	$(CP) ../misc/unix/grafx2.desktop $(DESTDIR)$(datadir)/applications/
 	$(CP) ../misc/unix/grafx2.appdata.xml $(DESTDIR)$(datadir)/metainfo/
@@ -1007,13 +998,13 @@ uninstall :
 	$(DELCOMMAND) $(SKIN_FILES:../share%=$(DESTDIR)$(datadir)%)
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/skins),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/skins,)
 	$(DELCOMMAND) $(SCRIPT_FILES:../share%=$(DESTDIR)$(datadir)%)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo/brush),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo/brush,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/demo,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/brush),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/brush,)
-	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/picture),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/picture,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/palette),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/palette,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/libs),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/libs,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/demo/brush),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/demo/brush,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/demo),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/demo,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples/brush),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples/brush,)
+	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/samples),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples,)
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts/libs),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs,)
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/scripts),$(RMDIR) $(DESTDIR)$(datadir)/grafx2/scripts,)
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2),$(RMDIR) $(DESTDIR)$(datadir)/grafx2,)