diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 42398f330..62651ccb6 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -523,7 +523,7 @@ tup.append_table(img_files, {
  {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
  {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"},
+ {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
  {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"},
  {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index a5607a64c..75467156a 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -163,7 +163,7 @@ echo *
 echo Building media
 echo *
 rem media\ac97snd\trunk\ac97snd.asm ac97snd
-fasm media\animage\trunk\animage.asm %BIN%\animage
+fasm media\animage\animage.asm %BIN%\animage
 fasm media\cdp\trunk\cdp.asm %BIN%\cdp
 fasm media\gifview\trunk\gifview.asm %BIN%\gifview
 fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
@@ -233,7 +233,7 @@ echo *
 echo __nightbuild fix yes >> config.inc
 fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv
 fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
-fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage
+fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
diff --git a/programs/media/animage/trunk/Tupfile.lua b/programs/media/animage/Tupfile.lua
similarity index 100%
rename from programs/media/animage/trunk/Tupfile.lua
rename to programs/media/animage/Tupfile.lua
diff --git a/programs/media/animage/trunk/animage.asm b/programs/media/animage/animage.asm
similarity index 100%
rename from programs/media/animage/trunk/animage.asm
rename to programs/media/animage/animage.asm
diff --git a/programs/media/animage/trunk/bmplib.inc b/programs/media/animage/bmplib.inc
similarity index 100%
rename from programs/media/animage/trunk/bmplib.inc
rename to programs/media/animage/bmplib.inc
diff --git a/programs/media/animage/trunk/brushes.inc b/programs/media/animage/brushes.inc
similarity index 100%
rename from programs/media/animage/trunk/brushes.inc
rename to programs/media/animage/brushes.inc
diff --git a/programs/media/animage/trunk/build.sh b/programs/media/animage/build.sh
similarity index 100%
rename from programs/media/animage/trunk/build.sh
rename to programs/media/animage/build.sh
diff --git a/programs/media/animage/trunk/build_en.bat b/programs/media/animage/build_en.bat
similarity index 100%
rename from programs/media/animage/trunk/build_en.bat
rename to programs/media/animage/build_en.bat
diff --git a/programs/media/animage/trunk/cursors.inc b/programs/media/animage/cursors.inc
similarity index 100%
rename from programs/media/animage/trunk/cursors.inc
rename to programs/media/animage/cursors.inc
diff --git a/programs/media/animage/trunk/cursors/brush.cur b/programs/media/animage/cursors/brush.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/brush.cur
rename to programs/media/animage/cursors/brush.cur
diff --git a/programs/media/animage/trunk/cursors/flood_fill.cur b/programs/media/animage/cursors/flood_fill.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/flood_fill.cur
rename to programs/media/animage/cursors/flood_fill.cur
diff --git a/programs/media/animage/trunk/cursors/lastik.cur b/programs/media/animage/cursors/lastik.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/lastik.cur
rename to programs/media/animage/cursors/lastik.cur
diff --git a/programs/media/animage/trunk/cursors/other.cur b/programs/media/animage/cursors/other.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/other.cur
rename to programs/media/animage/cursors/other.cur
diff --git a/programs/media/animage/trunk/cursors/pencil.cur b/programs/media/animage/cursors/pencil.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/pencil.cur
rename to programs/media/animage/cursors/pencil.cur
diff --git a/programs/media/animage/trunk/cursors/pipette.cur b/programs/media/animage/cursors/pipette.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/pipette.cur
rename to programs/media/animage/cursors/pipette.cur
diff --git a/programs/media/animage/trunk/cursors/spray.cur b/programs/media/animage/cursors/spray.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/spray.cur
rename to programs/media/animage/cursors/spray.cur
diff --git a/programs/media/animage/trunk/cursors/zoom.cur b/programs/media/animage/cursors/zoom.cur
similarity index 100%
rename from programs/media/animage/trunk/cursors/zoom.cur
rename to programs/media/animage/cursors/zoom.cur
diff --git a/programs/media/animage/trunk/design.inc b/programs/media/animage/design.inc
similarity index 100%
rename from programs/media/animage/trunk/design.inc
rename to programs/media/animage/design.inc
diff --git a/programs/media/animage/trunk/dialog2.inc b/programs/media/animage/dialog2.inc
similarity index 100%
rename from programs/media/animage/trunk/dialog2.inc
rename to programs/media/animage/dialog2.inc
diff --git a/programs/media/animage/trunk/events.inc b/programs/media/animage/events.inc
similarity index 100%
rename from programs/media/animage/trunk/events.inc
rename to programs/media/animage/events.inc
diff --git a/programs/media/animage/trunk/events_of_buttons.inc b/programs/media/animage/events_of_buttons.inc
similarity index 100%
rename from programs/media/animage/trunk/events_of_buttons.inc
rename to programs/media/animage/events_of_buttons.inc
diff --git a/programs/media/animage/trunk/events_of_keys.inc b/programs/media/animage/events_of_keys.inc
similarity index 100%
rename from programs/media/animage/trunk/events_of_keys.inc
rename to programs/media/animage/events_of_keys.inc
diff --git a/programs/media/animage/trunk/events_of_mouse.inc b/programs/media/animage/events_of_mouse.inc
similarity index 100%
rename from programs/media/animage/trunk/events_of_mouse.inc
rename to programs/media/animage/events_of_mouse.inc
diff --git a/programs/media/animage/trunk/events_of_window.inc b/programs/media/animage/events_of_window.inc
similarity index 100%
rename from programs/media/animage/trunk/events_of_window.inc
rename to programs/media/animage/events_of_window.inc
diff --git a/programs/media/animage/trunk/files.inc b/programs/media/animage/files.inc
similarity index 100%
rename from programs/media/animage/trunk/files.inc
rename to programs/media/animage/files.inc
diff --git a/programs/media/animage/trunk/graphlib.inc b/programs/media/animage/graphlib.inc
similarity index 100%
rename from programs/media/animage/trunk/graphlib.inc
rename to programs/media/animage/graphlib.inc
diff --git a/programs/media/animage/trunk/icons.inc b/programs/media/animage/icons.inc
similarity index 100%
rename from programs/media/animage/trunk/icons.inc
rename to programs/media/animage/icons.inc
diff --git a/programs/media/animage/trunk/icons_instruments.inc b/programs/media/animage/icons_instruments.inc
similarity index 100%
rename from programs/media/animage/trunk/icons_instruments.inc
rename to programs/media/animage/icons_instruments.inc
diff --git a/programs/media/animage/trunk/init_data.inc b/programs/media/animage/init_data.inc
similarity index 100%
rename from programs/media/animage/trunk/init_data.inc
rename to programs/media/animage/init_data.inc
diff --git a/programs/media/animage/trunk/lib_data.inc b/programs/media/animage/lib_data.inc
similarity index 100%
rename from programs/media/animage/trunk/lib_data.inc
rename to programs/media/animage/lib_data.inc
diff --git a/programs/media/animage/trunk/load_from_parameters.inc b/programs/media/animage/load_from_parameters.inc
similarity index 100%
rename from programs/media/animage/trunk/load_from_parameters.inc
rename to programs/media/animage/load_from_parameters.inc
diff --git a/programs/media/animage/trunk/memory.inc b/programs/media/animage/memory.inc
similarity index 100%
rename from programs/media/animage/trunk/memory.inc
rename to programs/media/animage/memory.inc
diff --git a/programs/media/animage/trunk/menu.inc b/programs/media/animage/menu.inc
similarity index 100%
rename from programs/media/animage/trunk/menu.inc
rename to programs/media/animage/menu.inc
diff --git a/programs/media/animage/trunk/menu_instruments.inc b/programs/media/animage/menu_instruments.inc
similarity index 100%
rename from programs/media/animage/trunk/menu_instruments.inc
rename to programs/media/animage/menu_instruments.inc
diff --git a/programs/media/animage/trunk/palette.inc b/programs/media/animage/palette.inc
similarity index 100%
rename from programs/media/animage/trunk/palette.inc
rename to programs/media/animage/palette.inc
diff --git a/programs/media/animage/trunk/panel_buttons.png b/programs/media/animage/panel_buttons.png
similarity index 100%
rename from programs/media/animage/trunk/panel_buttons.png
rename to programs/media/animage/panel_buttons.png
diff --git a/programs/media/animage/trunk/panel_data.inc b/programs/media/animage/panel_data.inc
similarity index 100%
rename from programs/media/animage/trunk/panel_data.inc
rename to programs/media/animage/panel_data.inc
diff --git a/programs/media/animage/trunk/panel_engen.inc b/programs/media/animage/panel_engen.inc
similarity index 100%
rename from programs/media/animage/trunk/panel_engen.inc
rename to programs/media/animage/panel_engen.inc
diff --git a/programs/media/animage/trunk/panel_zoom.png b/programs/media/animage/panel_zoom.png
similarity index 100%
rename from programs/media/animage/trunk/panel_zoom.png
rename to programs/media/animage/panel_zoom.png
diff --git a/programs/media/animage/trunk/screen.inc b/programs/media/animage/screen.inc
similarity index 100%
rename from programs/media/animage/trunk/screen.inc
rename to programs/media/animage/screen.inc
diff --git a/programs/media/animage/trunk/spray.inc b/programs/media/animage/spray.inc
similarity index 100%
rename from programs/media/animage/trunk/spray.inc
rename to programs/media/animage/spray.inc
diff --git a/programs/media/animage/trunk/sprites.inc b/programs/media/animage/sprites.inc
similarity index 100%
rename from programs/media/animage/trunk/sprites.inc
rename to programs/media/animage/sprites.inc
diff --git a/programs/media/animage/trunk/string.inc b/programs/media/animage/string.inc
similarity index 100%
rename from programs/media/animage/trunk/string.inc
rename to programs/media/animage/string.inc
diff --git a/programs/media/animage/trunk/time.inc b/programs/media/animage/time.inc
similarity index 100%
rename from programs/media/animage/trunk/time.inc
rename to programs/media/animage/time.inc
diff --git a/programs/media/animage/trunk/width_lines.inc b/programs/media/animage/width_lines.inc
similarity index 100%
rename from programs/media/animage/trunk/width_lines.inc
rename to programs/media/animage/width_lines.inc