[Scummvm-git-logs] scummvm master -> 39318d963ebc5cba6a7e2f9ce4357cc3f408242a
sev-
noreply at scummvm.org
Mon Oct 13 22:42:49 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
2cf610945b JANITORIAL: Fix table formatting
622e8a60a9 DIRECTOR: Unclutter lingo/xlibs directory by adding alphabetical directories
39318d963e DEVTOOLS: Adapt Director XObj stub generator to new directory structure
Commit: 2cf610945b03e99d1891a7fd24b756bafc116e60
https://github.com/scummvm/scummvm/commit/2cf610945b03e99d1891a7fd24b756bafc116e60
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-13T23:55:49+02:00
Commit Message:
JANITORIAL: Fix table formatting
Changed paths:
engines/director/lingo/lingo-object.cpp
diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index ad2545a2b73..7629584e0da 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -303,7 +303,7 @@ static const struct XLibProto {
XLIBDEF(MovUtilsXObj, kXObj, 400), // D4
XLIBDEF(MSFile, kXObj, 400), // D4
XLIBDEF(MystIsleXObj, kXObj, 400), // D4
- XLIBDEF(OSCheckXtra, kXtraObj, 400), // D4
+ XLIBDEF(OSCheckXtra, kXtraObj, 400), // D4
XLIBDEF(OpenBleedWindowXCMD,kXObj, 300), // D3
XLIBDEF(OpenURLXtra, kXtraObj, 500), // D5
XLIBDEF(OrthoPlayXObj, kXObj, 400), // D4
@@ -339,7 +339,7 @@ static const struct XLibProto {
XLIBDEF(VMPresentXObj, kXObj, 400), // D4
XLIBDEF(VMisOnXFCN, kXObj, 400), // D4
XLIBDEF(ValkyrieXObj, kXObj, 400), // D4
- XLIBDEF(VersionsXObj, kXObj, 400), // D4
+ XLIBDEF(VersionsXObj, kXObj, 400), // D4
XLIBDEF(VideodiscXObj, kXObj, 200), // D2
XLIBDEF(VolumeList, kXObj, 300), // D3
XLIBDEF(VoyagerXSoundXObj, kXObj, 400), // D4
Commit: 622e8a60a9cc7db4f481ae5ef6db956c10d17eab
https://github.com/scummvm/scummvm/commit/622e8a60a9cc7db4f481ae5ef6db956c10d17eab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-14T00:19:38+02:00
Commit Message:
DIRECTOR: Unclutter lingo/xlibs directory by adding alphabetical directories
Changed paths:
A engines/director/lingo/xlibs/a/aiff.cpp
A engines/director/lingo/xlibs/a/aiff.h
A engines/director/lingo/xlibs/a/applecdxobj.cpp
A engines/director/lingo/xlibs/a/applecdxobj.h
A engines/director/lingo/xlibs/a/askuser.cpp
A engines/director/lingo/xlibs/a/askuser.h
A engines/director/lingo/xlibs/b/backdrop.cpp
A engines/director/lingo/xlibs/b/backdrop.h
A engines/director/lingo/xlibs/b/barakeobj.cpp
A engines/director/lingo/xlibs/b/barakeobj.h
A engines/director/lingo/xlibs/b/batqt.cpp
A engines/director/lingo/xlibs/b/batqt.h
A engines/director/lingo/xlibs/b/bimxobj.cpp
A engines/director/lingo/xlibs/b/bimxobj.h
A engines/director/lingo/xlibs/b/blitpict.cpp
A engines/director/lingo/xlibs/b/blitpict.h
A engines/director/lingo/xlibs/c/cdromxobj.cpp
A engines/director/lingo/xlibs/c/cdromxobj.h
A engines/director/lingo/xlibs/c/closebleedwindowxcmd.cpp
A engines/director/lingo/xlibs/c/closebleedwindowxcmd.h
A engines/director/lingo/xlibs/c/colorcursorxobj.cpp
A engines/director/lingo/xlibs/c/colorcursorxobj.h
A engines/director/lingo/xlibs/c/colorxobj.cpp
A engines/director/lingo/xlibs/c/colorxobj.h
A engines/director/lingo/xlibs/c/consumer.cpp
A engines/director/lingo/xlibs/c/consumer.h
A engines/director/lingo/xlibs/c/cursorxobj.cpp
A engines/director/lingo/xlibs/c/cursorxobj.h
A engines/director/lingo/xlibs/d/darkenscreen.cpp
A engines/director/lingo/xlibs/d/darkenscreen.h
A engines/director/lingo/xlibs/d/dateutil.cpp
A engines/director/lingo/xlibs/d/dateutil.h
A engines/director/lingo/xlibs/d/developerStack.cpp
A engines/director/lingo/xlibs/d/developerStack.h
A engines/director/lingo/xlibs/d/dialogsxobj.cpp
A engines/director/lingo/xlibs/d/dialogsxobj.h
A engines/director/lingo/xlibs/d/dirutil.cpp
A engines/director/lingo/xlibs/d/dirutil.h
A engines/director/lingo/xlibs/d/dllglue.cpp
A engines/director/lingo/xlibs/d/dllglue.h
A engines/director/lingo/xlibs/d/dpwavi.cpp
A engines/director/lingo/xlibs/d/dpwavi.h
A engines/director/lingo/xlibs/d/dpwqtw.cpp
A engines/director/lingo/xlibs/d/dpwqtw.h
A engines/director/lingo/xlibs/d/draw.cpp
A engines/director/lingo/xlibs/d/draw.h
A engines/director/lingo/xlibs/e/ednox.cpp
A engines/director/lingo/xlibs/e/ednox.h
A engines/director/lingo/xlibs/e/eventq.cpp
A engines/director/lingo/xlibs/e/eventq.h
A engines/director/lingo/xlibs/f/fadegammadownxcmd.cpp
A engines/director/lingo/xlibs/f/fadegammadownxcmd.h
A engines/director/lingo/xlibs/f/fadegammaupxcmd.cpp
A engines/director/lingo/xlibs/f/fadegammaupxcmd.h
A engines/director/lingo/xlibs/f/fadegammaxcmd.cpp
A engines/director/lingo/xlibs/f/fadegammaxcmd.h
A engines/director/lingo/xlibs/f/fedracul.cpp
A engines/director/lingo/xlibs/f/fedracul.h
A engines/director/lingo/xlibs/f/feimasks.cpp
A engines/director/lingo/xlibs/f/feimasks.h
A engines/director/lingo/xlibs/f/feiprefs.cpp
A engines/director/lingo/xlibs/f/feiprefs.h
A engines/director/lingo/xlibs/f/fileexists.cpp
A engines/director/lingo/xlibs/f/fileexists.h
A engines/director/lingo/xlibs/f/fileio.cpp
A engines/director/lingo/xlibs/f/fileio.h
A engines/director/lingo/xlibs/f/findereventsxcmd.cpp
A engines/director/lingo/xlibs/f/findereventsxcmd.h
A engines/director/lingo/xlibs/f/findfolder.cpp
A engines/director/lingo/xlibs/f/findfolder.h
A engines/director/lingo/xlibs/f/findsys.cpp
A engines/director/lingo/xlibs/f/findsys.h
A engines/director/lingo/xlibs/f/findwin.cpp
A engines/director/lingo/xlibs/f/findwin.h
A engines/director/lingo/xlibs/f/flushxobj.cpp
A engines/director/lingo/xlibs/f/flushxobj.h
A engines/director/lingo/xlibs/f/fplayxobj.cpp
A engines/director/lingo/xlibs/f/fplayxobj.h
A engines/director/lingo/xlibs/f/fsutil.cpp
A engines/director/lingo/xlibs/f/fsutil.h
A engines/director/lingo/xlibs/g/genutils.cpp
A engines/director/lingo/xlibs/g/genutils.h
A engines/director/lingo/xlibs/g/getscreenrectsxfcn.cpp
A engines/director/lingo/xlibs/g/getscreenrectsxfcn.h
A engines/director/lingo/xlibs/g/getscreensizexfcn.cpp
A engines/director/lingo/xlibs/g/getscreensizexfcn.h
A engines/director/lingo/xlibs/g/getsoundinlevel.cpp
A engines/director/lingo/xlibs/g/getsoundinlevel.h
A engines/director/lingo/xlibs/g/gpid.cpp
A engines/director/lingo/xlibs/g/gpid.h
A engines/director/lingo/xlibs/h/henry.cpp
A engines/director/lingo/xlibs/h/henry.h
A engines/director/lingo/xlibs/h/hitmap.cpp
A engines/director/lingo/xlibs/h/hitmap.h
A engines/director/lingo/xlibs/i/inixobj.cpp
A engines/director/lingo/xlibs/i/inixobj.h
A engines/director/lingo/xlibs/i/instobj.cpp
A engines/director/lingo/xlibs/i/instobj.h
A engines/director/lingo/xlibs/i/iscd.cpp
A engines/director/lingo/xlibs/i/iscd.h
A engines/director/lingo/xlibs/i/ispippin.cpp
A engines/director/lingo/xlibs/i/ispippin.h
A engines/director/lingo/xlibs/j/jitdraw3.cpp
A engines/director/lingo/xlibs/j/jitdraw3.h
A engines/director/lingo/xlibs/j/jwxini.cpp
A engines/director/lingo/xlibs/j/jwxini.h
A engines/director/lingo/xlibs/l/labeldrvxobj.cpp
A engines/director/lingo/xlibs/l/labeldrvxobj.h
A engines/director/lingo/xlibs/l/listdev.cpp
A engines/director/lingo/xlibs/l/listdev.h
A engines/director/lingo/xlibs/m/maniacbg.cpp
A engines/director/lingo/xlibs/m/maniacbg.h
A engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
A engines/director/lingo/xlibs/m/mapnavigatorxobj.h
A engines/director/lingo/xlibs/m/memcheckxobj.cpp
A engines/director/lingo/xlibs/m/memcheckxobj.h
A engines/director/lingo/xlibs/m/memoryxobj.cpp
A engines/director/lingo/xlibs/m/memoryxobj.h
A engines/director/lingo/xlibs/m/misc.cpp
A engines/director/lingo/xlibs/m/misc.h
A engines/director/lingo/xlibs/m/miscx.cpp
A engines/director/lingo/xlibs/m/miscx.h
A engines/director/lingo/xlibs/m/mmaskxobj.cpp
A engines/director/lingo/xlibs/m/mmaskxobj.h
A engines/director/lingo/xlibs/m/mmovie.cpp
A engines/director/lingo/xlibs/m/mmovie.h
A engines/director/lingo/xlibs/m/moovxobj.cpp
A engines/director/lingo/xlibs/m/moovxobj.h
A engines/director/lingo/xlibs/m/movemousejp.cpp
A engines/director/lingo/xlibs/m/movemousejp.h
A engines/director/lingo/xlibs/m/movemousexobj.cpp
A engines/director/lingo/xlibs/m/movemousexobj.h
A engines/director/lingo/xlibs/m/movieidxxobj.cpp
A engines/director/lingo/xlibs/m/movieidxxobj.h
A engines/director/lingo/xlibs/m/movutils.cpp
A engines/director/lingo/xlibs/m/movutils.h
A engines/director/lingo/xlibs/m/msfile.cpp
A engines/director/lingo/xlibs/m/msfile.h
A engines/director/lingo/xlibs/m/mystisle.cpp
A engines/director/lingo/xlibs/m/mystisle.h
A engines/director/lingo/xlibs/o/openbleedwindowxcmd.cpp
A engines/director/lingo/xlibs/o/openbleedwindowxcmd.h
A engines/director/lingo/xlibs/o/orthoplayxobj.cpp
A engines/director/lingo/xlibs/o/orthoplayxobj.h
A engines/director/lingo/xlibs/p/paco.cpp
A engines/director/lingo/xlibs/p/paco.h
A engines/director/lingo/xlibs/p/palxobj.cpp
A engines/director/lingo/xlibs/p/palxobj.h
A engines/director/lingo/xlibs/p/panel.cpp
A engines/director/lingo/xlibs/p/panel.h
A engines/director/lingo/xlibs/p/pharaohs.cpp
A engines/director/lingo/xlibs/p/pharaohs.h
A engines/director/lingo/xlibs/p/popupmenuxobj.cpp
A engines/director/lingo/xlibs/p/popupmenuxobj.h
A engines/director/lingo/xlibs/p/porta.cpp
A engines/director/lingo/xlibs/p/porta.h
A engines/director/lingo/xlibs/p/prefpath.cpp
A engines/director/lingo/xlibs/p/prefpath.h
A engines/director/lingo/xlibs/p/printomatic.cpp
A engines/director/lingo/xlibs/p/printomatic.h
A engines/director/lingo/xlibs/p/processxobj.cpp
A engines/director/lingo/xlibs/p/processxobj.h
A engines/director/lingo/xlibs/p/putcurs.cpp
A engines/director/lingo/xlibs/p/putcurs.h
A engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.cpp
A engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.h
A engines/director/lingo/xlibs/q/qtmovie.cpp
A engines/director/lingo/xlibs/q/qtmovie.h
A engines/director/lingo/xlibs/q/qtvr.cpp
A engines/director/lingo/xlibs/q/qtvr.h
A engines/director/lingo/xlibs/q/quicktime.cpp
A engines/director/lingo/xlibs/q/quicktime.h
A engines/director/lingo/xlibs/r/registercomponent.cpp
A engines/director/lingo/xlibs/r/registercomponent.h
A engines/director/lingo/xlibs/r/remixxcmd.cpp
A engines/director/lingo/xlibs/r/remixxcmd.h
A engines/director/lingo/xlibs/s/serialportxobj.cpp
A engines/director/lingo/xlibs/s/serialportxobj.h
A engines/director/lingo/xlibs/s/smallutil.cpp
A engines/director/lingo/xlibs/s/smallutil.h
A engines/director/lingo/xlibs/s/soundjam.cpp
A engines/director/lingo/xlibs/s/soundjam.h
A engines/director/lingo/xlibs/s/spacemgr.cpp
A engines/director/lingo/xlibs/s/spacemgr.h
A engines/director/lingo/xlibs/s/stagetc.cpp
A engines/director/lingo/xlibs/s/stagetc.h
A engines/director/lingo/xlibs/s/syscolor.cpp
A engines/director/lingo/xlibs/s/syscolor.h
A engines/director/lingo/xlibs/t/tengu.cpp
A engines/director/lingo/xlibs/t/tengu.h
A engines/director/lingo/xlibs/u/unittest.cpp
A engines/director/lingo/xlibs/u/unittest.h
A engines/director/lingo/xlibs/v/valkyrie.cpp
A engines/director/lingo/xlibs/v/valkyrie.h
A engines/director/lingo/xlibs/v/versions.cpp
A engines/director/lingo/xlibs/v/versions.h
A engines/director/lingo/xlibs/v/videodiscxobj.cpp
A engines/director/lingo/xlibs/v/videodiscxobj.h
A engines/director/lingo/xlibs/v/vmisonxfcn.cpp
A engines/director/lingo/xlibs/v/vmisonxfcn.h
A engines/director/lingo/xlibs/v/vmpresent.cpp
A engines/director/lingo/xlibs/v/vmpresent.h
A engines/director/lingo/xlibs/v/volumelist.cpp
A engines/director/lingo/xlibs/v/volumelist.h
A engines/director/lingo/xlibs/v/voyagerxsound.cpp
A engines/director/lingo/xlibs/v/voyagerxsound.h
A engines/director/lingo/xlibs/w/widgetxobj.cpp
A engines/director/lingo/xlibs/w/widgetxobj.h
A engines/director/lingo/xlibs/w/window.cpp
A engines/director/lingo/xlibs/w/window.h
A engines/director/lingo/xlibs/w/wininfo.cpp
A engines/director/lingo/xlibs/w/wininfo.h
A engines/director/lingo/xlibs/w/winxobj.cpp
A engines/director/lingo/xlibs/w/winxobj.h
A engines/director/lingo/xlibs/x/xcmdglue.cpp
A engines/director/lingo/xlibs/x/xcmdglue.h
A engines/director/lingo/xlibs/x/xio.cpp
A engines/director/lingo/xlibs/x/xio.h
A engines/director/lingo/xlibs/x/xplayanim.cpp
A engines/director/lingo/xlibs/x/xplayanim.h
A engines/director/lingo/xlibs/x/xplaypacoxfcn.cpp
A engines/director/lingo/xlibs/x/xplaypacoxfcn.h
A engines/director/lingo/xlibs/x/xsoundxfcn.cpp
A engines/director/lingo/xlibs/x/xsoundxfcn.h
A engines/director/lingo/xlibs/x/xwin.cpp
A engines/director/lingo/xlibs/x/xwin.h
A engines/director/lingo/xlibs/y/yasix.cpp
A engines/director/lingo/xlibs/y/yasix.h
R engines/director/lingo/xlibs/aiff.cpp
R engines/director/lingo/xlibs/aiff.h
R engines/director/lingo/xlibs/applecdxobj.cpp
R engines/director/lingo/xlibs/applecdxobj.h
R engines/director/lingo/xlibs/askuser.cpp
R engines/director/lingo/xlibs/askuser.h
R engines/director/lingo/xlibs/backdrop.cpp
R engines/director/lingo/xlibs/backdrop.h
R engines/director/lingo/xlibs/barakeobj.cpp
R engines/director/lingo/xlibs/barakeobj.h
R engines/director/lingo/xlibs/batqt.cpp
R engines/director/lingo/xlibs/batqt.h
R engines/director/lingo/xlibs/bimxobj.cpp
R engines/director/lingo/xlibs/bimxobj.h
R engines/director/lingo/xlibs/blitpict.cpp
R engines/director/lingo/xlibs/blitpict.h
R engines/director/lingo/xlibs/cdromxobj.cpp
R engines/director/lingo/xlibs/cdromxobj.h
R engines/director/lingo/xlibs/closebleedwindowxcmd.cpp
R engines/director/lingo/xlibs/closebleedwindowxcmd.h
R engines/director/lingo/xlibs/colorcursorxobj.cpp
R engines/director/lingo/xlibs/colorcursorxobj.h
R engines/director/lingo/xlibs/colorxobj.cpp
R engines/director/lingo/xlibs/colorxobj.h
R engines/director/lingo/xlibs/consumer.cpp
R engines/director/lingo/xlibs/consumer.h
R engines/director/lingo/xlibs/cursorxobj.cpp
R engines/director/lingo/xlibs/cursorxobj.h
R engines/director/lingo/xlibs/darkenscreen.cpp
R engines/director/lingo/xlibs/darkenscreen.h
R engines/director/lingo/xlibs/dateutil.cpp
R engines/director/lingo/xlibs/dateutil.h
R engines/director/lingo/xlibs/developerStack.cpp
R engines/director/lingo/xlibs/developerStack.h
R engines/director/lingo/xlibs/dialogsxobj.cpp
R engines/director/lingo/xlibs/dialogsxobj.h
R engines/director/lingo/xlibs/dirutil.cpp
R engines/director/lingo/xlibs/dirutil.h
R engines/director/lingo/xlibs/dllglue.cpp
R engines/director/lingo/xlibs/dllglue.h
R engines/director/lingo/xlibs/dpwavi.cpp
R engines/director/lingo/xlibs/dpwavi.h
R engines/director/lingo/xlibs/dpwqtw.cpp
R engines/director/lingo/xlibs/dpwqtw.h
R engines/director/lingo/xlibs/draw.cpp
R engines/director/lingo/xlibs/draw.h
R engines/director/lingo/xlibs/ednox.cpp
R engines/director/lingo/xlibs/ednox.h
R engines/director/lingo/xlibs/eventq.cpp
R engines/director/lingo/xlibs/eventq.h
R engines/director/lingo/xlibs/fadegammadownxcmd.cpp
R engines/director/lingo/xlibs/fadegammadownxcmd.h
R engines/director/lingo/xlibs/fadegammaupxcmd.cpp
R engines/director/lingo/xlibs/fadegammaupxcmd.h
R engines/director/lingo/xlibs/fadegammaxcmd.cpp
R engines/director/lingo/xlibs/fadegammaxcmd.h
R engines/director/lingo/xlibs/fedracul.cpp
R engines/director/lingo/xlibs/fedracul.h
R engines/director/lingo/xlibs/feimasks.cpp
R engines/director/lingo/xlibs/feimasks.h
R engines/director/lingo/xlibs/feiprefs.cpp
R engines/director/lingo/xlibs/feiprefs.h
R engines/director/lingo/xlibs/fileexists.cpp
R engines/director/lingo/xlibs/fileexists.h
R engines/director/lingo/xlibs/fileio.cpp
R engines/director/lingo/xlibs/fileio.h
R engines/director/lingo/xlibs/findereventsxcmd.cpp
R engines/director/lingo/xlibs/findereventsxcmd.h
R engines/director/lingo/xlibs/findfolder.cpp
R engines/director/lingo/xlibs/findfolder.h
R engines/director/lingo/xlibs/findsys.cpp
R engines/director/lingo/xlibs/findsys.h
R engines/director/lingo/xlibs/findwin.cpp
R engines/director/lingo/xlibs/findwin.h
R engines/director/lingo/xlibs/flushxobj.cpp
R engines/director/lingo/xlibs/flushxobj.h
R engines/director/lingo/xlibs/fplayxobj.cpp
R engines/director/lingo/xlibs/fplayxobj.h
R engines/director/lingo/xlibs/fsutil.cpp
R engines/director/lingo/xlibs/fsutil.h
R engines/director/lingo/xlibs/genutils.cpp
R engines/director/lingo/xlibs/genutils.h
R engines/director/lingo/xlibs/getscreenrectsxfcn.cpp
R engines/director/lingo/xlibs/getscreenrectsxfcn.h
R engines/director/lingo/xlibs/getscreensizexfcn.cpp
R engines/director/lingo/xlibs/getscreensizexfcn.h
R engines/director/lingo/xlibs/getsoundinlevel.cpp
R engines/director/lingo/xlibs/getsoundinlevel.h
R engines/director/lingo/xlibs/gpid.cpp
R engines/director/lingo/xlibs/gpid.h
R engines/director/lingo/xlibs/henry.cpp
R engines/director/lingo/xlibs/henry.h
R engines/director/lingo/xlibs/hitmap.cpp
R engines/director/lingo/xlibs/hitmap.h
R engines/director/lingo/xlibs/inixobj.cpp
R engines/director/lingo/xlibs/inixobj.h
R engines/director/lingo/xlibs/instobj.cpp
R engines/director/lingo/xlibs/instobj.h
R engines/director/lingo/xlibs/iscd.cpp
R engines/director/lingo/xlibs/iscd.h
R engines/director/lingo/xlibs/ispippin.cpp
R engines/director/lingo/xlibs/ispippin.h
R engines/director/lingo/xlibs/jitdraw3.cpp
R engines/director/lingo/xlibs/jitdraw3.h
R engines/director/lingo/xlibs/jwxini.cpp
R engines/director/lingo/xlibs/jwxini.h
R engines/director/lingo/xlibs/labeldrvxobj.cpp
R engines/director/lingo/xlibs/labeldrvxobj.h
R engines/director/lingo/xlibs/listdev.cpp
R engines/director/lingo/xlibs/listdev.h
R engines/director/lingo/xlibs/maniacbg.cpp
R engines/director/lingo/xlibs/maniacbg.h
R engines/director/lingo/xlibs/mapnavigatorxobj.cpp
R engines/director/lingo/xlibs/mapnavigatorxobj.h
R engines/director/lingo/xlibs/memcheckxobj.cpp
R engines/director/lingo/xlibs/memcheckxobj.h
R engines/director/lingo/xlibs/memoryxobj.cpp
R engines/director/lingo/xlibs/memoryxobj.h
R engines/director/lingo/xlibs/misc.cpp
R engines/director/lingo/xlibs/misc.h
R engines/director/lingo/xlibs/miscx.cpp
R engines/director/lingo/xlibs/miscx.h
R engines/director/lingo/xlibs/mmaskxobj.cpp
R engines/director/lingo/xlibs/mmaskxobj.h
R engines/director/lingo/xlibs/mmovie.cpp
R engines/director/lingo/xlibs/mmovie.h
R engines/director/lingo/xlibs/moovxobj.cpp
R engines/director/lingo/xlibs/moovxobj.h
R engines/director/lingo/xlibs/movemousejp.cpp
R engines/director/lingo/xlibs/movemousejp.h
R engines/director/lingo/xlibs/movemousexobj.cpp
R engines/director/lingo/xlibs/movemousexobj.h
R engines/director/lingo/xlibs/movieidxxobj.cpp
R engines/director/lingo/xlibs/movieidxxobj.h
R engines/director/lingo/xlibs/movutils.cpp
R engines/director/lingo/xlibs/movutils.h
R engines/director/lingo/xlibs/msfile.cpp
R engines/director/lingo/xlibs/msfile.h
R engines/director/lingo/xlibs/mystisle.cpp
R engines/director/lingo/xlibs/mystisle.h
R engines/director/lingo/xlibs/openbleedwindowxcmd.cpp
R engines/director/lingo/xlibs/openbleedwindowxcmd.h
R engines/director/lingo/xlibs/orthoplayxobj.cpp
R engines/director/lingo/xlibs/orthoplayxobj.h
R engines/director/lingo/xlibs/paco.cpp
R engines/director/lingo/xlibs/paco.h
R engines/director/lingo/xlibs/palxobj.cpp
R engines/director/lingo/xlibs/palxobj.h
R engines/director/lingo/xlibs/panel.cpp
R engines/director/lingo/xlibs/panel.h
R engines/director/lingo/xlibs/pharaohs.cpp
R engines/director/lingo/xlibs/pharaohs.h
R engines/director/lingo/xlibs/popupmenuxobj.cpp
R engines/director/lingo/xlibs/popupmenuxobj.h
R engines/director/lingo/xlibs/porta.cpp
R engines/director/lingo/xlibs/porta.h
R engines/director/lingo/xlibs/prefpath.cpp
R engines/director/lingo/xlibs/prefpath.h
R engines/director/lingo/xlibs/printomatic.cpp
R engines/director/lingo/xlibs/printomatic.h
R engines/director/lingo/xlibs/processxobj.cpp
R engines/director/lingo/xlibs/processxobj.h
R engines/director/lingo/xlibs/putcurs.cpp
R engines/director/lingo/xlibs/putcurs.h
R engines/director/lingo/xlibs/qtcatmovieplayerxobj.cpp
R engines/director/lingo/xlibs/qtcatmovieplayerxobj.h
R engines/director/lingo/xlibs/qtmovie.cpp
R engines/director/lingo/xlibs/qtmovie.h
R engines/director/lingo/xlibs/qtvr.cpp
R engines/director/lingo/xlibs/qtvr.h
R engines/director/lingo/xlibs/quicktime.cpp
R engines/director/lingo/xlibs/quicktime.h
R engines/director/lingo/xlibs/registercomponent.cpp
R engines/director/lingo/xlibs/registercomponent.h
R engines/director/lingo/xlibs/remixxcmd.cpp
R engines/director/lingo/xlibs/remixxcmd.h
R engines/director/lingo/xlibs/serialportxobj.cpp
R engines/director/lingo/xlibs/serialportxobj.h
R engines/director/lingo/xlibs/smallutil.cpp
R engines/director/lingo/xlibs/smallutil.h
R engines/director/lingo/xlibs/soundjam.cpp
R engines/director/lingo/xlibs/soundjam.h
R engines/director/lingo/xlibs/spacemgr.cpp
R engines/director/lingo/xlibs/spacemgr.h
R engines/director/lingo/xlibs/stagetc.cpp
R engines/director/lingo/xlibs/stagetc.h
R engines/director/lingo/xlibs/syscolor.cpp
R engines/director/lingo/xlibs/syscolor.h
R engines/director/lingo/xlibs/tengu.cpp
R engines/director/lingo/xlibs/tengu.h
R engines/director/lingo/xlibs/unittest.cpp
R engines/director/lingo/xlibs/unittest.h
R engines/director/lingo/xlibs/valkyrie.cpp
R engines/director/lingo/xlibs/valkyrie.h
R engines/director/lingo/xlibs/versions.cpp
R engines/director/lingo/xlibs/versions.h
R engines/director/lingo/xlibs/videodiscxobj.cpp
R engines/director/lingo/xlibs/videodiscxobj.h
R engines/director/lingo/xlibs/vmisonxfcn.cpp
R engines/director/lingo/xlibs/vmisonxfcn.h
R engines/director/lingo/xlibs/vmpresent.cpp
R engines/director/lingo/xlibs/vmpresent.h
R engines/director/lingo/xlibs/volumelist.cpp
R engines/director/lingo/xlibs/volumelist.h
R engines/director/lingo/xlibs/voyagerxsound.cpp
R engines/director/lingo/xlibs/voyagerxsound.h
R engines/director/lingo/xlibs/widgetxobj.cpp
R engines/director/lingo/xlibs/widgetxobj.h
R engines/director/lingo/xlibs/window.cpp
R engines/director/lingo/xlibs/window.h
R engines/director/lingo/xlibs/wininfo.cpp
R engines/director/lingo/xlibs/wininfo.h
R engines/director/lingo/xlibs/winxobj.cpp
R engines/director/lingo/xlibs/winxobj.h
R engines/director/lingo/xlibs/xcmdglue.cpp
R engines/director/lingo/xlibs/xcmdglue.h
R engines/director/lingo/xlibs/xio.cpp
R engines/director/lingo/xlibs/xio.h
R engines/director/lingo/xlibs/xplayanim.cpp
R engines/director/lingo/xlibs/xplayanim.h
R engines/director/lingo/xlibs/xplaypacoxfcn.cpp
R engines/director/lingo/xlibs/xplaypacoxfcn.h
R engines/director/lingo/xlibs/xsoundxfcn.cpp
R engines/director/lingo/xlibs/xsoundxfcn.h
R engines/director/lingo/xlibs/xwin.cpp
R engines/director/lingo/xlibs/xwin.h
R engines/director/lingo/xlibs/yasix.cpp
R engines/director/lingo/xlibs/yasix.h
engines/director/lingo/lingo-object.cpp
engines/director/module.mk
diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 7629584e0da..5797fcaf1ae 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -30,120 +30,120 @@
#include "director/lingo/lingo-code.h"
#include "director/lingo/lingo-the.h"
-#include "director/lingo/xlibs/aiff.h"
-#include "director/lingo/xlibs/applecdxobj.h"
-#include "director/lingo/xlibs/askuser.h"
-#include "director/lingo/xlibs/backdrop.h"
-#include "director/lingo/xlibs/barakeobj.h"
-#include "director/lingo/xlibs/batqt.h"
-#include "director/lingo/xlibs/bimxobj.h"
-#include "director/lingo/xlibs/blitpict.h"
-#include "director/lingo/xlibs/cdromxobj.h"
-#include "director/lingo/xlibs/closebleedwindowxcmd.h"
-#include "director/lingo/xlibs/colorxobj.h"
-#include "director/lingo/xlibs/colorcursorxobj.h"
-#include "director/lingo/xlibs/consumer.h"
-#include "director/lingo/xlibs/cursorxobj.h"
-#include "director/lingo/xlibs/darkenscreen.h"
-#include "director/lingo/xlibs/dateutil.h"
-#include "director/lingo/xlibs/developerStack.h"
-#include "director/lingo/xlibs/dialogsxobj.h"
-#include "director/lingo/xlibs/dirutil.h"
-#include "director/lingo/xlibs/dllglue.h"
-#include "director/lingo/xlibs/dpwavi.h"
-#include "director/lingo/xlibs/dpwqtw.h"
-#include "director/lingo/xlibs/draw.h"
-#include "director/lingo/xlibs/ednox.h"
-#include "director/lingo/xlibs/eventq.h"
-#include "director/lingo/xlibs/fadegammadownxcmd.h"
-#include "director/lingo/xlibs/fadegammaupxcmd.h"
-#include "director/lingo/xlibs/fadegammaxcmd.h"
-#include "director/lingo/xlibs/fedracul.h"
-#include "director/lingo/xlibs/feimasks.h"
-#include "director/lingo/xlibs/feiprefs.h"
-#include "director/lingo/xlibs/fileexists.h"
-#include "director/lingo/xlibs/fileio.h"
-#include "director/lingo/xlibs/findereventsxcmd.h"
-#include "director/lingo/xlibs/findfolder.h"
-#include "director/lingo/xlibs/findsys.h"
-#include "director/lingo/xlibs/findwin.h"
-#include "director/lingo/xlibs/flushxobj.h"
-#include "director/lingo/xlibs/fplayxobj.h"
-#include "director/lingo/xlibs/fsutil.h"
-#include "director/lingo/xlibs/genutils.h"
-#include "director/lingo/xlibs/getscreenrectsxfcn.h"
-#include "director/lingo/xlibs/getscreensizexfcn.h"
-#include "director/lingo/xlibs/getsoundinlevel.h"
-#include "director/lingo/xlibs/gpid.h"
-#include "director/lingo/xlibs/henry.h"
-#include "director/lingo/xlibs/hitmap.h"
-#include "director/lingo/xlibs/inixobj.h"
-#include "director/lingo/xlibs/instobj.h"
-#include "director/lingo/xlibs/jwxini.h"
-#include "director/lingo/xlibs/iscd.h"
-#include "director/lingo/xlibs/ispippin.h"
-#include "director/lingo/xlibs/jitdraw3.h"
-#include "director/lingo/xlibs/labeldrvxobj.h"
-#include "director/lingo/xlibs/listdev.h"
-#include "director/lingo/xlibs/maniacbg.h"
-#include "director/lingo/xlibs/mapnavigatorxobj.h"
-#include "director/lingo/xlibs/memcheckxobj.h"
-#include "director/lingo/xlibs/memoryxobj.h"
-#include "director/lingo/xlibs/misc.h"
-#include "director/lingo/xlibs/miscx.h"
-#include "director/lingo/xlibs/mmaskxobj.h"
-#include "director/lingo/xlibs/mmovie.h"
-#include "director/lingo/xlibs/moovxobj.h"
-#include "director/lingo/xlibs/movemousejp.h"
-#include "director/lingo/xlibs/movemousexobj.h"
-#include "director/lingo/xlibs/movieidxxobj.h"
-#include "director/lingo/xlibs/movutils.h"
-#include "director/lingo/xlibs/msfile.h"
-#include "director/lingo/xlibs/mystisle.h"
-#include "director/lingo/xlibs/openbleedwindowxcmd.h"
-#include "director/lingo/xlibs/orthoplayxobj.h"
-#include "director/lingo/xlibs/paco.h"
-#include "director/lingo/xlibs/palxobj.h"
-#include "director/lingo/xlibs/panel.h"
-#include "director/lingo/xlibs/pharaohs.h"
-#include "director/lingo/xlibs/popupmenuxobj.h"
-#include "director/lingo/xlibs/porta.h"
-#include "director/lingo/xlibs/prefpath.h"
-#include "director/lingo/xlibs/printomatic.h"
-#include "director/lingo/xlibs/processxobj.h"
-#include "director/lingo/xlibs/putcurs.h"
-#include "director/lingo/xlibs/qtmovie.h"
-#include "director/lingo/xlibs/qtcatmovieplayerxobj.h"
-#include "director/lingo/xlibs/qtvr.h"
-#include "director/lingo/xlibs/quicktime.h"
-#include "director/lingo/xlibs/registercomponent.h"
-#include "director/lingo/xlibs/remixxcmd.h"
-#include "director/lingo/xlibs/serialportxobj.h"
-#include "director/lingo/xlibs/smallutil.h"
-#include "director/lingo/xlibs/soundjam.h"
-#include "director/lingo/xlibs/spacemgr.h"
-#include "director/lingo/xlibs/stagetc.h"
-#include "director/lingo/xlibs/syscolor.h"
-#include "director/lingo/xlibs/tengu.h"
-#include "director/lingo/xlibs/unittest.h"
-#include "director/lingo/xlibs/valkyrie.h"
-#include "director/lingo/xlibs/versions.h"
-#include "director/lingo/xlibs/videodiscxobj.h"
-#include "director/lingo/xlibs/vmisonxfcn.h"
-#include "director/lingo/xlibs/vmpresent.h"
-#include "director/lingo/xlibs/volumelist.h"
-#include "director/lingo/xlibs/voyagerxsound.h"
-#include "director/lingo/xlibs/widgetxobj.h"
-#include "director/lingo/xlibs/window.h"
-#include "director/lingo/xlibs/wininfo.h"
-#include "director/lingo/xlibs/winxobj.h"
-#include "director/lingo/xlibs/xcmdglue.h"
-#include "director/lingo/xlibs/xio.h"
-#include "director/lingo/xlibs/xplayanim.h"
-#include "director/lingo/xlibs/xplaypacoxfcn.h"
-#include "director/lingo/xlibs/xsoundxfcn.h"
-#include "director/lingo/xlibs/xwin.h"
-#include "director/lingo/xlibs/yasix.h"
+#include "director/lingo/xlibs/a/aiff.h"
+#include "director/lingo/xlibs/a/applecdxobj.h"
+#include "director/lingo/xlibs/a/askuser.h"
+#include "director/lingo/xlibs/b/backdrop.h"
+#include "director/lingo/xlibs/b/barakeobj.h"
+#include "director/lingo/xlibs/b/batqt.h"
+#include "director/lingo/xlibs/b/bimxobj.h"
+#include "director/lingo/xlibs/b/blitpict.h"
+#include "director/lingo/xlibs/c/cdromxobj.h"
+#include "director/lingo/xlibs/c/closebleedwindowxcmd.h"
+#include "director/lingo/xlibs/c/colorxobj.h"
+#include "director/lingo/xlibs/c/colorcursorxobj.h"
+#include "director/lingo/xlibs/c/consumer.h"
+#include "director/lingo/xlibs/c/cursorxobj.h"
+#include "director/lingo/xlibs/d/darkenscreen.h"
+#include "director/lingo/xlibs/d/dateutil.h"
+#include "director/lingo/xlibs/d/developerStack.h"
+#include "director/lingo/xlibs/d/dialogsxobj.h"
+#include "director/lingo/xlibs/d/dirutil.h"
+#include "director/lingo/xlibs/d/dllglue.h"
+#include "director/lingo/xlibs/d/dpwavi.h"
+#include "director/lingo/xlibs/d/dpwqtw.h"
+#include "director/lingo/xlibs/d/draw.h"
+#include "director/lingo/xlibs/e/ednox.h"
+#include "director/lingo/xlibs/e/eventq.h"
+#include "director/lingo/xlibs/f/fadegammadownxcmd.h"
+#include "director/lingo/xlibs/f/fadegammaupxcmd.h"
+#include "director/lingo/xlibs/f/fadegammaxcmd.h"
+#include "director/lingo/xlibs/f/fedracul.h"
+#include "director/lingo/xlibs/f/feimasks.h"
+#include "director/lingo/xlibs/f/feiprefs.h"
+#include "director/lingo/xlibs/f/fileexists.h"
+#include "director/lingo/xlibs/f/fileio.h"
+#include "director/lingo/xlibs/f/findereventsxcmd.h"
+#include "director/lingo/xlibs/f/findfolder.h"
+#include "director/lingo/xlibs/f/findsys.h"
+#include "director/lingo/xlibs/f/findwin.h"
+#include "director/lingo/xlibs/f/flushxobj.h"
+#include "director/lingo/xlibs/f/fplayxobj.h"
+#include "director/lingo/xlibs/f/fsutil.h"
+#include "director/lingo/xlibs/g/genutils.h"
+#include "director/lingo/xlibs/g/getscreenrectsxfcn.h"
+#include "director/lingo/xlibs/g/getscreensizexfcn.h"
+#include "director/lingo/xlibs/g/getsoundinlevel.h"
+#include "director/lingo/xlibs/g/gpid.h"
+#include "director/lingo/xlibs/h/henry.h"
+#include "director/lingo/xlibs/h/hitmap.h"
+#include "director/lingo/xlibs/i/inixobj.h"
+#include "director/lingo/xlibs/i/instobj.h"
+#include "director/lingo/xlibs/j/jwxini.h"
+#include "director/lingo/xlibs/i/iscd.h"
+#include "director/lingo/xlibs/i/ispippin.h"
+#include "director/lingo/xlibs/j/jitdraw3.h"
+#include "director/lingo/xlibs/l/labeldrvxobj.h"
+#include "director/lingo/xlibs/l/listdev.h"
+#include "director/lingo/xlibs/m/maniacbg.h"
+#include "director/lingo/xlibs/m/mapnavigatorxobj.h"
+#include "director/lingo/xlibs/m/memcheckxobj.h"
+#include "director/lingo/xlibs/m/memoryxobj.h"
+#include "director/lingo/xlibs/m/misc.h"
+#include "director/lingo/xlibs/m/miscx.h"
+#include "director/lingo/xlibs/m/mmaskxobj.h"
+#include "director/lingo/xlibs/m/mmovie.h"
+#include "director/lingo/xlibs/m/moovxobj.h"
+#include "director/lingo/xlibs/m/movemousejp.h"
+#include "director/lingo/xlibs/m/movemousexobj.h"
+#include "director/lingo/xlibs/m/movieidxxobj.h"
+#include "director/lingo/xlibs/m/movutils.h"
+#include "director/lingo/xlibs/m/msfile.h"
+#include "director/lingo/xlibs/m/mystisle.h"
+#include "director/lingo/xlibs/o/openbleedwindowxcmd.h"
+#include "director/lingo/xlibs/o/orthoplayxobj.h"
+#include "director/lingo/xlibs/p/paco.h"
+#include "director/lingo/xlibs/p/palxobj.h"
+#include "director/lingo/xlibs/p/panel.h"
+#include "director/lingo/xlibs/p/pharaohs.h"
+#include "director/lingo/xlibs/p/popupmenuxobj.h"
+#include "director/lingo/xlibs/p/porta.h"
+#include "director/lingo/xlibs/p/prefpath.h"
+#include "director/lingo/xlibs/p/printomatic.h"
+#include "director/lingo/xlibs/p/processxobj.h"
+#include "director/lingo/xlibs/p/putcurs.h"
+#include "director/lingo/xlibs/q/qtmovie.h"
+#include "director/lingo/xlibs/q/qtcatmovieplayerxobj.h"
+#include "director/lingo/xlibs/q/qtvr.h"
+#include "director/lingo/xlibs/q/quicktime.h"
+#include "director/lingo/xlibs/r/registercomponent.h"
+#include "director/lingo/xlibs/r/remixxcmd.h"
+#include "director/lingo/xlibs/s/serialportxobj.h"
+#include "director/lingo/xlibs/s/smallutil.h"
+#include "director/lingo/xlibs/s/soundjam.h"
+#include "director/lingo/xlibs/s/spacemgr.h"
+#include "director/lingo/xlibs/s/stagetc.h"
+#include "director/lingo/xlibs/s/syscolor.h"
+#include "director/lingo/xlibs/t/tengu.h"
+#include "director/lingo/xlibs/u/unittest.h"
+#include "director/lingo/xlibs/v/valkyrie.h"
+#include "director/lingo/xlibs/v/versions.h"
+#include "director/lingo/xlibs/v/videodiscxobj.h"
+#include "director/lingo/xlibs/v/vmisonxfcn.h"
+#include "director/lingo/xlibs/v/vmpresent.h"
+#include "director/lingo/xlibs/v/volumelist.h"
+#include "director/lingo/xlibs/v/voyagerxsound.h"
+#include "director/lingo/xlibs/w/widgetxobj.h"
+#include "director/lingo/xlibs/w/window.h"
+#include "director/lingo/xlibs/w/wininfo.h"
+#include "director/lingo/xlibs/w/winxobj.h"
+#include "director/lingo/xlibs/x/xcmdglue.h"
+#include "director/lingo/xlibs/x/xio.h"
+#include "director/lingo/xlibs/x/xplayanim.h"
+#include "director/lingo/xlibs/x/xplaypacoxfcn.h"
+#include "director/lingo/xlibs/x/xsoundxfcn.h"
+#include "director/lingo/xlibs/x/xwin.h"
+#include "director/lingo/xlibs/y/yasix.h"
#include "director/lingo/xtras/directsound.h"
#include "director/lingo/xtras/filextra.h"
#include "director/lingo/xtras/keypoll.h"
diff --git a/engines/director/lingo/xlibs/aiff.cpp b/engines/director/lingo/xlibs/a/aiff.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/aiff.cpp
rename to engines/director/lingo/xlibs/a/aiff.cpp
index 432e2fb2914..1bdc6d2e1ce 100644
--- a/engines/director/lingo/xlibs/aiff.cpp
+++ b/engines/director/lingo/xlibs/a/aiff.cpp
@@ -50,7 +50,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/aiff.h"
+#include "director/lingo/xlibs/a/aiff.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/aiff.h b/engines/director/lingo/xlibs/a/aiff.h
similarity index 100%
rename from engines/director/lingo/xlibs/aiff.h
rename to engines/director/lingo/xlibs/a/aiff.h
diff --git a/engines/director/lingo/xlibs/applecdxobj.cpp b/engines/director/lingo/xlibs/a/applecdxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/applecdxobj.cpp
rename to engines/director/lingo/xlibs/a/applecdxobj.cpp
index f77e0e6a323..812b8ff694a 100644
--- a/engines/director/lingo/xlibs/applecdxobj.cpp
+++ b/engines/director/lingo/xlibs/a/applecdxobj.cpp
@@ -92,7 +92,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/applecdxobj.h"
+#include "director/lingo/xlibs/a/applecdxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/applecdxobj.h b/engines/director/lingo/xlibs/a/applecdxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/applecdxobj.h
rename to engines/director/lingo/xlibs/a/applecdxobj.h
diff --git a/engines/director/lingo/xlibs/askuser.cpp b/engines/director/lingo/xlibs/a/askuser.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/askuser.cpp
rename to engines/director/lingo/xlibs/a/askuser.cpp
index b287ed48d85..c786855fd62 100644
--- a/engines/director/lingo/xlibs/askuser.cpp
+++ b/engines/director/lingo/xlibs/a/askuser.cpp
@@ -26,7 +26,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/askuser.h"
+#include "director/lingo/xlibs/a/askuser.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/askuser.h b/engines/director/lingo/xlibs/a/askuser.h
similarity index 100%
rename from engines/director/lingo/xlibs/askuser.h
rename to engines/director/lingo/xlibs/a/askuser.h
diff --git a/engines/director/lingo/xlibs/backdrop.cpp b/engines/director/lingo/xlibs/b/backdrop.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/backdrop.cpp
rename to engines/director/lingo/xlibs/b/backdrop.cpp
index 2338042f410..7c61a58d8ff 100644
--- a/engines/director/lingo/xlibs/backdrop.cpp
+++ b/engines/director/lingo/xlibs/b/backdrop.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/backdrop.h"
+#include "director/lingo/xlibs/b/backdrop.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/backdrop.h b/engines/director/lingo/xlibs/b/backdrop.h
similarity index 100%
rename from engines/director/lingo/xlibs/backdrop.h
rename to engines/director/lingo/xlibs/b/backdrop.h
diff --git a/engines/director/lingo/xlibs/barakeobj.cpp b/engines/director/lingo/xlibs/b/barakeobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/barakeobj.cpp
rename to engines/director/lingo/xlibs/b/barakeobj.cpp
index a736ca029d9..a440799bc64 100644
--- a/engines/director/lingo/xlibs/barakeobj.cpp
+++ b/engines/director/lingo/xlibs/b/barakeobj.cpp
@@ -38,7 +38,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/barakeobj.h"
+#include "director/lingo/xlibs/b/barakeobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/barakeobj.h b/engines/director/lingo/xlibs/b/barakeobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/barakeobj.h
rename to engines/director/lingo/xlibs/b/barakeobj.h
diff --git a/engines/director/lingo/xlibs/batqt.cpp b/engines/director/lingo/xlibs/b/batqt.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/batqt.cpp
rename to engines/director/lingo/xlibs/b/batqt.cpp
index d894070a950..0eb203592b5 100644
--- a/engines/director/lingo/xlibs/batqt.cpp
+++ b/engines/director/lingo/xlibs/b/batqt.cpp
@@ -60,7 +60,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/batqt.h"
+#include "director/lingo/xlibs/b/batqt.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/batqt.h b/engines/director/lingo/xlibs/b/batqt.h
similarity index 100%
rename from engines/director/lingo/xlibs/batqt.h
rename to engines/director/lingo/xlibs/b/batqt.h
diff --git a/engines/director/lingo/xlibs/bimxobj.cpp b/engines/director/lingo/xlibs/b/bimxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/bimxobj.cpp
rename to engines/director/lingo/xlibs/b/bimxobj.cpp
index 29ebd2ca542..096f6f06380 100644
--- a/engines/director/lingo/xlibs/bimxobj.cpp
+++ b/engines/director/lingo/xlibs/b/bimxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/bimxobj.h"
+#include "director/lingo/xlibs/b/bimxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/bimxobj.h b/engines/director/lingo/xlibs/b/bimxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/bimxobj.h
rename to engines/director/lingo/xlibs/b/bimxobj.h
diff --git a/engines/director/lingo/xlibs/blitpict.cpp b/engines/director/lingo/xlibs/b/blitpict.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/blitpict.cpp
rename to engines/director/lingo/xlibs/b/blitpict.cpp
index 118d488218a..e8223d0ab3a 100644
--- a/engines/director/lingo/xlibs/blitpict.cpp
+++ b/engines/director/lingo/xlibs/b/blitpict.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/blitpict.h"
+#include "director/lingo/xlibs/b/blitpict.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/blitpict.h b/engines/director/lingo/xlibs/b/blitpict.h
similarity index 100%
rename from engines/director/lingo/xlibs/blitpict.h
rename to engines/director/lingo/xlibs/b/blitpict.h
diff --git a/engines/director/lingo/xlibs/cdromxobj.cpp b/engines/director/lingo/xlibs/c/cdromxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/cdromxobj.cpp
rename to engines/director/lingo/xlibs/c/cdromxobj.cpp
index 9b27f1effa2..24cdc142d22 100644
--- a/engines/director/lingo/xlibs/cdromxobj.cpp
+++ b/engines/director/lingo/xlibs/c/cdromxobj.cpp
@@ -167,7 +167,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/cdromxobj.h"
+#include "director/lingo/xlibs/c/cdromxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/cdromxobj.h b/engines/director/lingo/xlibs/c/cdromxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/cdromxobj.h
rename to engines/director/lingo/xlibs/c/cdromxobj.h
diff --git a/engines/director/lingo/xlibs/closebleedwindowxcmd.cpp b/engines/director/lingo/xlibs/c/closebleedwindowxcmd.cpp
similarity index 96%
rename from engines/director/lingo/xlibs/closebleedwindowxcmd.cpp
rename to engines/director/lingo/xlibs/c/closebleedwindowxcmd.cpp
index 6152b21ae82..307cc935014 100644
--- a/engines/director/lingo/xlibs/closebleedwindowxcmd.cpp
+++ b/engines/director/lingo/xlibs/c/closebleedwindowxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/closebleedwindowxcmd.h"
+#include "director/lingo/xlibs/c/closebleedwindowxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/closebleedwindowxcmd.h b/engines/director/lingo/xlibs/c/closebleedwindowxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/closebleedwindowxcmd.h
rename to engines/director/lingo/xlibs/c/closebleedwindowxcmd.h
diff --git a/engines/director/lingo/xlibs/colorcursorxobj.cpp b/engines/director/lingo/xlibs/c/colorcursorxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/colorcursorxobj.cpp
rename to engines/director/lingo/xlibs/c/colorcursorxobj.cpp
index 3768bd6576e..0669a14bcbb 100644
--- a/engines/director/lingo/xlibs/colorcursorxobj.cpp
+++ b/engines/director/lingo/xlibs/c/colorcursorxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/colorcursorxobj.h"
+#include "director/lingo/xlibs/c/colorcursorxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/colorcursorxobj.h b/engines/director/lingo/xlibs/c/colorcursorxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/colorcursorxobj.h
rename to engines/director/lingo/xlibs/c/colorcursorxobj.h
diff --git a/engines/director/lingo/xlibs/colorxobj.cpp b/engines/director/lingo/xlibs/c/colorxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/colorxobj.cpp
rename to engines/director/lingo/xlibs/c/colorxobj.cpp
index f8d829e29c7..af1f7244b79 100644
--- a/engines/director/lingo/xlibs/colorxobj.cpp
+++ b/engines/director/lingo/xlibs/c/colorxobj.cpp
@@ -54,7 +54,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/colorxobj.h"
+#include "director/lingo/xlibs/c/colorxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/colorxobj.h b/engines/director/lingo/xlibs/c/colorxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/colorxobj.h
rename to engines/director/lingo/xlibs/c/colorxobj.h
diff --git a/engines/director/lingo/xlibs/consumer.cpp b/engines/director/lingo/xlibs/c/consumer.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/consumer.cpp
rename to engines/director/lingo/xlibs/c/consumer.cpp
index af5abcbaae1..1db8c13e7cc 100644
--- a/engines/director/lingo/xlibs/consumer.cpp
+++ b/engines/director/lingo/xlibs/c/consumer.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/consumer.h"
+#include "director/lingo/xlibs/c/consumer.h"
/*
* Used in: Bob Winkle Solves Life's Greatest Mysteries
diff --git a/engines/director/lingo/xlibs/consumer.h b/engines/director/lingo/xlibs/c/consumer.h
similarity index 100%
rename from engines/director/lingo/xlibs/consumer.h
rename to engines/director/lingo/xlibs/c/consumer.h
diff --git a/engines/director/lingo/xlibs/cursorxobj.cpp b/engines/director/lingo/xlibs/c/cursorxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/cursorxobj.cpp
rename to engines/director/lingo/xlibs/c/cursorxobj.cpp
index 98e477d1c06..6d39cbf1864 100644
--- a/engines/director/lingo/xlibs/cursorxobj.cpp
+++ b/engines/director/lingo/xlibs/c/cursorxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/cursorxobj.h"
+#include "director/lingo/xlibs/c/cursorxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/cursorxobj.h b/engines/director/lingo/xlibs/c/cursorxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/cursorxobj.h
rename to engines/director/lingo/xlibs/c/cursorxobj.h
diff --git a/engines/director/lingo/xlibs/darkenscreen.cpp b/engines/director/lingo/xlibs/d/darkenscreen.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/darkenscreen.cpp
rename to engines/director/lingo/xlibs/d/darkenscreen.cpp
index bfceb30d733..f9fec94379d 100644
--- a/engines/director/lingo/xlibs/darkenscreen.cpp
+++ b/engines/director/lingo/xlibs/d/darkenscreen.cpp
@@ -34,7 +34,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/darkenscreen.h"
+#include "director/lingo/xlibs/d/darkenscreen.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/darkenscreen.h b/engines/director/lingo/xlibs/d/darkenscreen.h
similarity index 100%
rename from engines/director/lingo/xlibs/darkenscreen.h
rename to engines/director/lingo/xlibs/d/darkenscreen.h
diff --git a/engines/director/lingo/xlibs/dateutil.cpp b/engines/director/lingo/xlibs/d/dateutil.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/dateutil.cpp
rename to engines/director/lingo/xlibs/d/dateutil.cpp
index 086d1004fa5..3822758f372 100644
--- a/engines/director/lingo/xlibs/dateutil.cpp
+++ b/engines/director/lingo/xlibs/d/dateutil.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/dateutil.h"
+#include "director/lingo/xlibs/d/dateutil.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/dateutil.h b/engines/director/lingo/xlibs/d/dateutil.h
similarity index 100%
rename from engines/director/lingo/xlibs/dateutil.h
rename to engines/director/lingo/xlibs/d/dateutil.h
diff --git a/engines/director/lingo/xlibs/developerStack.cpp b/engines/director/lingo/xlibs/d/developerStack.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/developerStack.cpp
rename to engines/director/lingo/xlibs/d/developerStack.cpp
index 89fd20ebeb0..3690cb4c733 100644
--- a/engines/director/lingo/xlibs/developerStack.cpp
+++ b/engines/director/lingo/xlibs/d/developerStack.cpp
@@ -24,7 +24,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/developerStack.h"
+#include "director/lingo/xlibs/d/developerStack.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/developerStack.h b/engines/director/lingo/xlibs/d/developerStack.h
similarity index 100%
rename from engines/director/lingo/xlibs/developerStack.h
rename to engines/director/lingo/xlibs/d/developerStack.h
diff --git a/engines/director/lingo/xlibs/dialogsxobj.cpp b/engines/director/lingo/xlibs/d/dialogsxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/dialogsxobj.cpp
rename to engines/director/lingo/xlibs/d/dialogsxobj.cpp
index dac4b5231f3..90a25e55c27 100644
--- a/engines/director/lingo/xlibs/dialogsxobj.cpp
+++ b/engines/director/lingo/xlibs/d/dialogsxobj.cpp
@@ -48,7 +48,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/dialogsxobj.h"
+#include "director/lingo/xlibs/d/dialogsxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/dialogsxobj.h b/engines/director/lingo/xlibs/d/dialogsxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/dialogsxobj.h
rename to engines/director/lingo/xlibs/d/dialogsxobj.h
diff --git a/engines/director/lingo/xlibs/dirutil.cpp b/engines/director/lingo/xlibs/d/dirutil.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/dirutil.cpp
rename to engines/director/lingo/xlibs/d/dirutil.cpp
index b628bf12608..0fbc88f15df 100644
--- a/engines/director/lingo/xlibs/dirutil.cpp
+++ b/engines/director/lingo/xlibs/d/dirutil.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/dirutil.h"
+#include "director/lingo/xlibs/d/dirutil.h"
/*
-- DIRUTIL External Factory. 16Feb93 PTM
diff --git a/engines/director/lingo/xlibs/dirutil.h b/engines/director/lingo/xlibs/d/dirutil.h
similarity index 100%
rename from engines/director/lingo/xlibs/dirutil.h
rename to engines/director/lingo/xlibs/d/dirutil.h
diff --git a/engines/director/lingo/xlibs/dllglue.cpp b/engines/director/lingo/xlibs/d/dllglue.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/dllglue.cpp
rename to engines/director/lingo/xlibs/d/dllglue.cpp
index 61c38855310..ce919de0f8a 100644
--- a/engines/director/lingo/xlibs/dllglue.cpp
+++ b/engines/director/lingo/xlibs/d/dllglue.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/dllglue.h"
+#include "director/lingo/xlibs/d/dllglue.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/dllglue.h b/engines/director/lingo/xlibs/d/dllglue.h
similarity index 100%
rename from engines/director/lingo/xlibs/dllglue.h
rename to engines/director/lingo/xlibs/d/dllglue.h
diff --git a/engines/director/lingo/xlibs/dpwavi.cpp b/engines/director/lingo/xlibs/d/dpwavi.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/dpwavi.cpp
rename to engines/director/lingo/xlibs/d/dpwavi.cpp
index 1346d243376..c757065d02b 100644
--- a/engines/director/lingo/xlibs/dpwavi.cpp
+++ b/engines/director/lingo/xlibs/d/dpwavi.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/dpwavi.h"
+#include "director/lingo/xlibs/d/dpwavi.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/dpwavi.h b/engines/director/lingo/xlibs/d/dpwavi.h
similarity index 100%
rename from engines/director/lingo/xlibs/dpwavi.h
rename to engines/director/lingo/xlibs/d/dpwavi.h
diff --git a/engines/director/lingo/xlibs/dpwqtw.cpp b/engines/director/lingo/xlibs/d/dpwqtw.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/dpwqtw.cpp
rename to engines/director/lingo/xlibs/d/dpwqtw.cpp
index 6bcaa71f8f6..b5acd3783eb 100644
--- a/engines/director/lingo/xlibs/dpwqtw.cpp
+++ b/engines/director/lingo/xlibs/d/dpwqtw.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/dpwqtw.h"
+#include "director/lingo/xlibs/d/dpwqtw.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/dpwqtw.h b/engines/director/lingo/xlibs/d/dpwqtw.h
similarity index 100%
rename from engines/director/lingo/xlibs/dpwqtw.h
rename to engines/director/lingo/xlibs/d/dpwqtw.h
diff --git a/engines/director/lingo/xlibs/draw.cpp b/engines/director/lingo/xlibs/d/draw.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/draw.cpp
rename to engines/director/lingo/xlibs/d/draw.cpp
index 41524b87552..9b05f073570 100644
--- a/engines/director/lingo/xlibs/draw.cpp
+++ b/engines/director/lingo/xlibs/d/draw.cpp
@@ -84,7 +84,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/draw.h"
+#include "director/lingo/xlibs/d/draw.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/draw.h b/engines/director/lingo/xlibs/d/draw.h
similarity index 100%
rename from engines/director/lingo/xlibs/draw.h
rename to engines/director/lingo/xlibs/d/draw.h
diff --git a/engines/director/lingo/xlibs/ednox.cpp b/engines/director/lingo/xlibs/e/ednox.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/ednox.cpp
rename to engines/director/lingo/xlibs/e/ednox.cpp
index d97a0d6c382..5a6d10a3cf8 100644
--- a/engines/director/lingo/xlibs/ednox.cpp
+++ b/engines/director/lingo/xlibs/e/ednox.cpp
@@ -60,7 +60,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/ednox.h"
+#include "director/lingo/xlibs/e/ednox.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/ednox.h b/engines/director/lingo/xlibs/e/ednox.h
similarity index 100%
rename from engines/director/lingo/xlibs/ednox.h
rename to engines/director/lingo/xlibs/e/ednox.h
diff --git a/engines/director/lingo/xlibs/eventq.cpp b/engines/director/lingo/xlibs/e/eventq.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/eventq.cpp
rename to engines/director/lingo/xlibs/e/eventq.cpp
index 6b361bd28b9..62b158bebb3 100644
--- a/engines/director/lingo/xlibs/eventq.cpp
+++ b/engines/director/lingo/xlibs/e/eventq.cpp
@@ -44,7 +44,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/eventq.h"
+#include "director/lingo/xlibs/e/eventq.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/eventq.h b/engines/director/lingo/xlibs/e/eventq.h
similarity index 100%
rename from engines/director/lingo/xlibs/eventq.h
rename to engines/director/lingo/xlibs/e/eventq.h
diff --git a/engines/director/lingo/xlibs/fadegammadownxcmd.cpp b/engines/director/lingo/xlibs/f/fadegammadownxcmd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/fadegammadownxcmd.cpp
rename to engines/director/lingo/xlibs/f/fadegammadownxcmd.cpp
index 884c7e4d81f..5767be3eccb 100644
--- a/engines/director/lingo/xlibs/fadegammadownxcmd.cpp
+++ b/engines/director/lingo/xlibs/f/fadegammadownxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fadegammadownxcmd.h"
+#include "director/lingo/xlibs/f/fadegammadownxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/fadegammadownxcmd.h b/engines/director/lingo/xlibs/f/fadegammadownxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/fadegammadownxcmd.h
rename to engines/director/lingo/xlibs/f/fadegammadownxcmd.h
diff --git a/engines/director/lingo/xlibs/fadegammaupxcmd.cpp b/engines/director/lingo/xlibs/f/fadegammaupxcmd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/fadegammaupxcmd.cpp
rename to engines/director/lingo/xlibs/f/fadegammaupxcmd.cpp
index 5544b19e4d3..48d09906e60 100644
--- a/engines/director/lingo/xlibs/fadegammaupxcmd.cpp
+++ b/engines/director/lingo/xlibs/f/fadegammaupxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fadegammaupxcmd.h"
+#include "director/lingo/xlibs/f/fadegammaupxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/fadegammaupxcmd.h b/engines/director/lingo/xlibs/f/fadegammaupxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/fadegammaupxcmd.h
rename to engines/director/lingo/xlibs/f/fadegammaupxcmd.h
diff --git a/engines/director/lingo/xlibs/fadegammaxcmd.cpp b/engines/director/lingo/xlibs/f/fadegammaxcmd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/fadegammaxcmd.cpp
rename to engines/director/lingo/xlibs/f/fadegammaxcmd.cpp
index c6611442ff6..7b4150cc170 100644
--- a/engines/director/lingo/xlibs/fadegammaxcmd.cpp
+++ b/engines/director/lingo/xlibs/f/fadegammaxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fadegammaxcmd.h"
+#include "director/lingo/xlibs/f/fadegammaxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/fadegammaxcmd.h b/engines/director/lingo/xlibs/f/fadegammaxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/fadegammaxcmd.h
rename to engines/director/lingo/xlibs/f/fadegammaxcmd.h
diff --git a/engines/director/lingo/xlibs/fedracul.cpp b/engines/director/lingo/xlibs/f/fedracul.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/fedracul.cpp
rename to engines/director/lingo/xlibs/f/fedracul.cpp
index 9a1ca2cdd4b..b344fefba15 100644
--- a/engines/director/lingo/xlibs/fedracul.cpp
+++ b/engines/director/lingo/xlibs/f/fedracul.cpp
@@ -47,7 +47,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/fedracul.h"
+#include "director/lingo/xlibs/f/fedracul.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/fedracul.h b/engines/director/lingo/xlibs/f/fedracul.h
similarity index 100%
rename from engines/director/lingo/xlibs/fedracul.h
rename to engines/director/lingo/xlibs/f/fedracul.h
diff --git a/engines/director/lingo/xlibs/feimasks.cpp b/engines/director/lingo/xlibs/f/feimasks.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/feimasks.cpp
rename to engines/director/lingo/xlibs/f/feimasks.cpp
index 3a2a931bc9d..4e6b8976c93 100644
--- a/engines/director/lingo/xlibs/feimasks.cpp
+++ b/engines/director/lingo/xlibs/f/feimasks.cpp
@@ -38,7 +38,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/feimasks.h"
+#include "director/lingo/xlibs/f/feimasks.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/feimasks.h b/engines/director/lingo/xlibs/f/feimasks.h
similarity index 100%
rename from engines/director/lingo/xlibs/feimasks.h
rename to engines/director/lingo/xlibs/f/feimasks.h
diff --git a/engines/director/lingo/xlibs/feiprefs.cpp b/engines/director/lingo/xlibs/f/feiprefs.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/feiprefs.cpp
rename to engines/director/lingo/xlibs/f/feiprefs.cpp
index 1b5485539c6..aaeb74de7b7 100644
--- a/engines/director/lingo/xlibs/feiprefs.cpp
+++ b/engines/director/lingo/xlibs/f/feiprefs.cpp
@@ -42,7 +42,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/feiprefs.h"
+#include "director/lingo/xlibs/f/feiprefs.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/feiprefs.h b/engines/director/lingo/xlibs/f/feiprefs.h
similarity index 100%
rename from engines/director/lingo/xlibs/feiprefs.h
rename to engines/director/lingo/xlibs/f/feiprefs.h
diff --git a/engines/director/lingo/xlibs/fileexists.cpp b/engines/director/lingo/xlibs/f/fileexists.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/fileexists.cpp
rename to engines/director/lingo/xlibs/f/fileexists.cpp
index cf1e15f8d3e..149e33c4b89 100644
--- a/engines/director/lingo/xlibs/fileexists.cpp
+++ b/engines/director/lingo/xlibs/f/fileexists.cpp
@@ -37,7 +37,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/fileexists.h"
+#include "director/lingo/xlibs/f/fileexists.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/fileexists.h b/engines/director/lingo/xlibs/f/fileexists.h
similarity index 100%
rename from engines/director/lingo/xlibs/fileexists.h
rename to engines/director/lingo/xlibs/f/fileexists.h
diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/f/fileio.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/fileio.cpp
rename to engines/director/lingo/xlibs/f/fileio.cpp
index 6223a0e0106..2752bf2b7f2 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/f/fileio.cpp
@@ -134,7 +134,7 @@ delete object me -- deletes the open file
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fileio.h"
+#include "director/lingo/xlibs/f/fileio.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/fileio.h b/engines/director/lingo/xlibs/f/fileio.h
similarity index 100%
rename from engines/director/lingo/xlibs/fileio.h
rename to engines/director/lingo/xlibs/f/fileio.h
diff --git a/engines/director/lingo/xlibs/findereventsxcmd.cpp b/engines/director/lingo/xlibs/f/findereventsxcmd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/findereventsxcmd.cpp
rename to engines/director/lingo/xlibs/f/findereventsxcmd.cpp
index a9240320803..649b9fbf26c 100644
--- a/engines/director/lingo/xlibs/findereventsxcmd.cpp
+++ b/engines/director/lingo/xlibs/f/findereventsxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/findereventsxcmd.h"
+#include "director/lingo/xlibs/f/findereventsxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/findereventsxcmd.h b/engines/director/lingo/xlibs/f/findereventsxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/findereventsxcmd.h
rename to engines/director/lingo/xlibs/f/findereventsxcmd.h
diff --git a/engines/director/lingo/xlibs/findfolder.cpp b/engines/director/lingo/xlibs/f/findfolder.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/findfolder.cpp
rename to engines/director/lingo/xlibs/f/findfolder.cpp
index edb39b23f64..982d6e65341 100644
--- a/engines/director/lingo/xlibs/findfolder.cpp
+++ b/engines/director/lingo/xlibs/f/findfolder.cpp
@@ -85,7 +85,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/findfolder.h"
+#include "director/lingo/xlibs/f/findfolder.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/findfolder.h b/engines/director/lingo/xlibs/f/findfolder.h
similarity index 100%
rename from engines/director/lingo/xlibs/findfolder.h
rename to engines/director/lingo/xlibs/f/findfolder.h
diff --git a/engines/director/lingo/xlibs/findsys.cpp b/engines/director/lingo/xlibs/f/findsys.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/findsys.cpp
rename to engines/director/lingo/xlibs/f/findsys.cpp
index e78ccf1af59..b2285d9780f 100644
--- a/engines/director/lingo/xlibs/findsys.cpp
+++ b/engines/director/lingo/xlibs/f/findsys.cpp
@@ -42,7 +42,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/findsys.h"
+#include "director/lingo/xlibs/f/findsys.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/findsys.h b/engines/director/lingo/xlibs/f/findsys.h
similarity index 100%
rename from engines/director/lingo/xlibs/findsys.h
rename to engines/director/lingo/xlibs/f/findsys.h
diff --git a/engines/director/lingo/xlibs/findwin.cpp b/engines/director/lingo/xlibs/f/findwin.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/findwin.cpp
rename to engines/director/lingo/xlibs/f/findwin.cpp
index e243adda7d5..8cf15d02ed9 100644
--- a/engines/director/lingo/xlibs/findwin.cpp
+++ b/engines/director/lingo/xlibs/f/findwin.cpp
@@ -39,7 +39,7 @@ S mDo --Return the System directory path as a string
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/findwin.h"
+#include "director/lingo/xlibs/f/findwin.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/findwin.h b/engines/director/lingo/xlibs/f/findwin.h
similarity index 100%
rename from engines/director/lingo/xlibs/findwin.h
rename to engines/director/lingo/xlibs/f/findwin.h
diff --git a/engines/director/lingo/xlibs/flushxobj.cpp b/engines/director/lingo/xlibs/f/flushxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/flushxobj.cpp
rename to engines/director/lingo/xlibs/f/flushxobj.cpp
index 03d0bfc214f..23dd9bb74bc 100644
--- a/engines/director/lingo/xlibs/flushxobj.cpp
+++ b/engines/director/lingo/xlibs/f/flushxobj.cpp
@@ -36,7 +36,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/flushxobj.h"
+#include "director/lingo/xlibs/f/flushxobj.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/flushxobj.h b/engines/director/lingo/xlibs/f/flushxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/flushxobj.h
rename to engines/director/lingo/xlibs/f/flushxobj.h
diff --git a/engines/director/lingo/xlibs/fplayxobj.cpp b/engines/director/lingo/xlibs/f/fplayxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/fplayxobj.cpp
rename to engines/director/lingo/xlibs/f/fplayxobj.cpp
index 8053b8ce695..f67ec064e20 100644
--- a/engines/director/lingo/xlibs/fplayxobj.cpp
+++ b/engines/director/lingo/xlibs/f/fplayxobj.cpp
@@ -35,7 +35,7 @@
#include "director/window.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fplayxobj.h"
+#include "director/lingo/xlibs/f/fplayxobj.h"
#include "audio/audiostream.h"
diff --git a/engines/director/lingo/xlibs/fplayxobj.h b/engines/director/lingo/xlibs/f/fplayxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/fplayxobj.h
rename to engines/director/lingo/xlibs/f/fplayxobj.h
diff --git a/engines/director/lingo/xlibs/fsutil.cpp b/engines/director/lingo/xlibs/f/fsutil.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/fsutil.cpp
rename to engines/director/lingo/xlibs/f/fsutil.cpp
index 3ca635c07cd..104ff90c754 100644
--- a/engines/director/lingo/xlibs/fsutil.cpp
+++ b/engines/director/lingo/xlibs/f/fsutil.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/fsutil.h"
+#include "director/lingo/xlibs/f/fsutil.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/fsutil.h b/engines/director/lingo/xlibs/f/fsutil.h
similarity index 100%
rename from engines/director/lingo/xlibs/fsutil.h
rename to engines/director/lingo/xlibs/f/fsutil.h
diff --git a/engines/director/lingo/xlibs/genutils.cpp b/engines/director/lingo/xlibs/g/genutils.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/genutils.cpp
rename to engines/director/lingo/xlibs/g/genutils.cpp
index cc2c4a46512..0ff90823a3d 100644
--- a/engines/director/lingo/xlibs/genutils.cpp
+++ b/engines/director/lingo/xlibs/g/genutils.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/genutils.h"
+#include "director/lingo/xlibs/g/genutils.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/genutils.h b/engines/director/lingo/xlibs/g/genutils.h
similarity index 100%
rename from engines/director/lingo/xlibs/genutils.h
rename to engines/director/lingo/xlibs/g/genutils.h
diff --git a/engines/director/lingo/xlibs/getscreenrectsxfcn.cpp b/engines/director/lingo/xlibs/g/getscreenrectsxfcn.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/getscreenrectsxfcn.cpp
rename to engines/director/lingo/xlibs/g/getscreenrectsxfcn.cpp
index 1727f56931e..481ebba0f6d 100644
--- a/engines/director/lingo/xlibs/getscreenrectsxfcn.cpp
+++ b/engines/director/lingo/xlibs/g/getscreenrectsxfcn.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/getscreenrectsxfcn.h"
+#include "director/lingo/xlibs/g/getscreenrectsxfcn.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/getscreenrectsxfcn.h b/engines/director/lingo/xlibs/g/getscreenrectsxfcn.h
similarity index 100%
rename from engines/director/lingo/xlibs/getscreenrectsxfcn.h
rename to engines/director/lingo/xlibs/g/getscreenrectsxfcn.h
diff --git a/engines/director/lingo/xlibs/getscreensizexfcn.cpp b/engines/director/lingo/xlibs/g/getscreensizexfcn.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/getscreensizexfcn.cpp
rename to engines/director/lingo/xlibs/g/getscreensizexfcn.cpp
index 91261a5a199..1c3f4a19f4e 100644
--- a/engines/director/lingo/xlibs/getscreensizexfcn.cpp
+++ b/engines/director/lingo/xlibs/g/getscreensizexfcn.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/getscreensizexfcn.h"
+#include "director/lingo/xlibs/g/getscreensizexfcn.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/getscreensizexfcn.h b/engines/director/lingo/xlibs/g/getscreensizexfcn.h
similarity index 100%
rename from engines/director/lingo/xlibs/getscreensizexfcn.h
rename to engines/director/lingo/xlibs/g/getscreensizexfcn.h
diff --git a/engines/director/lingo/xlibs/getsoundinlevel.cpp b/engines/director/lingo/xlibs/g/getsoundinlevel.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/getsoundinlevel.cpp
rename to engines/director/lingo/xlibs/g/getsoundinlevel.cpp
index d98b213b11a..b9e3fb3350a 100644
--- a/engines/director/lingo/xlibs/getsoundinlevel.cpp
+++ b/engines/director/lingo/xlibs/g/getsoundinlevel.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/getsoundinlevel.h"
+#include "director/lingo/xlibs/g/getsoundinlevel.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/getsoundinlevel.h b/engines/director/lingo/xlibs/g/getsoundinlevel.h
similarity index 100%
rename from engines/director/lingo/xlibs/getsoundinlevel.h
rename to engines/director/lingo/xlibs/g/getsoundinlevel.h
diff --git a/engines/director/lingo/xlibs/gpid.cpp b/engines/director/lingo/xlibs/g/gpid.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/gpid.cpp
rename to engines/director/lingo/xlibs/g/gpid.cpp
index 8cf52a2d8ee..9ea750b0325 100644
--- a/engines/director/lingo/xlibs/gpid.cpp
+++ b/engines/director/lingo/xlibs/g/gpid.cpp
@@ -47,7 +47,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/gpid.h"
+#include "director/lingo/xlibs/g/gpid.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/gpid.h b/engines/director/lingo/xlibs/g/gpid.h
similarity index 100%
rename from engines/director/lingo/xlibs/gpid.h
rename to engines/director/lingo/xlibs/g/gpid.h
diff --git a/engines/director/lingo/xlibs/henry.cpp b/engines/director/lingo/xlibs/h/henry.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/henry.cpp
rename to engines/director/lingo/xlibs/h/henry.cpp
index 77e65aeec8e..527d43b29fe 100644
--- a/engines/director/lingo/xlibs/henry.cpp
+++ b/engines/director/lingo/xlibs/h/henry.cpp
@@ -26,7 +26,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/henry.h"
+#include "director/lingo/xlibs/h/henry.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/henry.h b/engines/director/lingo/xlibs/h/henry.h
similarity index 100%
rename from engines/director/lingo/xlibs/henry.h
rename to engines/director/lingo/xlibs/h/henry.h
diff --git a/engines/director/lingo/xlibs/hitmap.cpp b/engines/director/lingo/xlibs/h/hitmap.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/hitmap.cpp
rename to engines/director/lingo/xlibs/h/hitmap.cpp
index b9e079e34ac..91db150b913 100644
--- a/engines/director/lingo/xlibs/hitmap.cpp
+++ b/engines/director/lingo/xlibs/h/hitmap.cpp
@@ -43,7 +43,7 @@ X mDispose --Dispose of memory allocation
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/hitmap.h"
+#include "director/lingo/xlibs/h/hitmap.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/hitmap.h b/engines/director/lingo/xlibs/h/hitmap.h
similarity index 100%
rename from engines/director/lingo/xlibs/hitmap.h
rename to engines/director/lingo/xlibs/h/hitmap.h
diff --git a/engines/director/lingo/xlibs/inixobj.cpp b/engines/director/lingo/xlibs/i/inixobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/inixobj.cpp
rename to engines/director/lingo/xlibs/i/inixobj.cpp
index bd1656541c6..58e2b1445d6 100644
--- a/engines/director/lingo/xlibs/inixobj.cpp
+++ b/engines/director/lingo/xlibs/i/inixobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/inixobj.h"
+#include "director/lingo/xlibs/i/inixobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/inixobj.h b/engines/director/lingo/xlibs/i/inixobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/inixobj.h
rename to engines/director/lingo/xlibs/i/inixobj.h
diff --git a/engines/director/lingo/xlibs/instobj.cpp b/engines/director/lingo/xlibs/i/instobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/instobj.cpp
rename to engines/director/lingo/xlibs/i/instobj.cpp
index 88bd913c716..84e6ca94118 100644
--- a/engines/director/lingo/xlibs/instobj.cpp
+++ b/engines/director/lingo/xlibs/i/instobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/instobj.h"
+#include "director/lingo/xlibs/i/instobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/instobj.h b/engines/director/lingo/xlibs/i/instobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/instobj.h
rename to engines/director/lingo/xlibs/i/instobj.h
diff --git a/engines/director/lingo/xlibs/iscd.cpp b/engines/director/lingo/xlibs/i/iscd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/iscd.cpp
rename to engines/director/lingo/xlibs/i/iscd.cpp
index 93688ea22c9..774a6c420b5 100644
--- a/engines/director/lingo/xlibs/iscd.cpp
+++ b/engines/director/lingo/xlibs/i/iscd.cpp
@@ -29,7 +29,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/iscd.h"
+#include "director/lingo/xlibs/i/iscd.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/iscd.h b/engines/director/lingo/xlibs/i/iscd.h
similarity index 100%
rename from engines/director/lingo/xlibs/iscd.h
rename to engines/director/lingo/xlibs/i/iscd.h
diff --git a/engines/director/lingo/xlibs/ispippin.cpp b/engines/director/lingo/xlibs/i/ispippin.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/ispippin.cpp
rename to engines/director/lingo/xlibs/i/ispippin.cpp
index 9c0886b76c7..8470aed3590 100644
--- a/engines/director/lingo/xlibs/ispippin.cpp
+++ b/engines/director/lingo/xlibs/i/ispippin.cpp
@@ -29,7 +29,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/ispippin.h"
+#include "director/lingo/xlibs/i/ispippin.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/ispippin.h b/engines/director/lingo/xlibs/i/ispippin.h
similarity index 100%
rename from engines/director/lingo/xlibs/ispippin.h
rename to engines/director/lingo/xlibs/i/ispippin.h
diff --git a/engines/director/lingo/xlibs/jitdraw3.cpp b/engines/director/lingo/xlibs/j/jitdraw3.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/jitdraw3.cpp
rename to engines/director/lingo/xlibs/j/jitdraw3.cpp
index 71313d3f7f2..687aab1c566 100644
--- a/engines/director/lingo/xlibs/jitdraw3.cpp
+++ b/engines/director/lingo/xlibs/j/jitdraw3.cpp
@@ -66,7 +66,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/jitdraw3.h"
+#include "director/lingo/xlibs/j/jitdraw3.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/jitdraw3.h b/engines/director/lingo/xlibs/j/jitdraw3.h
similarity index 100%
rename from engines/director/lingo/xlibs/jitdraw3.h
rename to engines/director/lingo/xlibs/j/jitdraw3.h
diff --git a/engines/director/lingo/xlibs/jwxini.cpp b/engines/director/lingo/xlibs/j/jwxini.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/jwxini.cpp
rename to engines/director/lingo/xlibs/j/jwxini.cpp
index a1101cb62f3..d02f39ea0ef 100644
--- a/engines/director/lingo/xlibs/jwxini.cpp
+++ b/engines/director/lingo/xlibs/j/jwxini.cpp
@@ -45,7 +45,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/jwxini.h"
+#include "director/lingo/xlibs/j/jwxini.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/jwxini.h b/engines/director/lingo/xlibs/j/jwxini.h
similarity index 100%
rename from engines/director/lingo/xlibs/jwxini.h
rename to engines/director/lingo/xlibs/j/jwxini.h
diff --git a/engines/director/lingo/xlibs/labeldrvxobj.cpp b/engines/director/lingo/xlibs/l/labeldrvxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/labeldrvxobj.cpp
rename to engines/director/lingo/xlibs/l/labeldrvxobj.cpp
index 48c0ba9c083..3187e4001f6 100644
--- a/engines/director/lingo/xlibs/labeldrvxobj.cpp
+++ b/engines/director/lingo/xlibs/l/labeldrvxobj.cpp
@@ -38,7 +38,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/labeldrvxobj.h"
+#include "director/lingo/xlibs/l/labeldrvxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/labeldrvxobj.h b/engines/director/lingo/xlibs/l/labeldrvxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/labeldrvxobj.h
rename to engines/director/lingo/xlibs/l/labeldrvxobj.h
diff --git a/engines/director/lingo/xlibs/listdev.cpp b/engines/director/lingo/xlibs/l/listdev.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/listdev.cpp
rename to engines/director/lingo/xlibs/l/listdev.cpp
index b1228154cb4..1095508e2a2 100644
--- a/engines/director/lingo/xlibs/listdev.cpp
+++ b/engines/director/lingo/xlibs/l/listdev.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/listdev.h"
+#include "director/lingo/xlibs/l/listdev.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/listdev.h b/engines/director/lingo/xlibs/l/listdev.h
similarity index 100%
rename from engines/director/lingo/xlibs/listdev.h
rename to engines/director/lingo/xlibs/l/listdev.h
diff --git a/engines/director/lingo/xlibs/maniacbg.cpp b/engines/director/lingo/xlibs/m/maniacbg.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/maniacbg.cpp
rename to engines/director/lingo/xlibs/m/maniacbg.cpp
index b200c86cc98..08c04a9560b 100644
--- a/engines/director/lingo/xlibs/maniacbg.cpp
+++ b/engines/director/lingo/xlibs/m/maniacbg.cpp
@@ -26,7 +26,7 @@
#include "director/lingo/lingo-builtins.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/maniacbg.h"
+#include "director/lingo/xlibs/m/maniacbg.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/maniacbg.h b/engines/director/lingo/xlibs/m/maniacbg.h
similarity index 100%
rename from engines/director/lingo/xlibs/maniacbg.h
rename to engines/director/lingo/xlibs/m/maniacbg.h
diff --git a/engines/director/lingo/xlibs/mapnavigatorxobj.cpp b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/mapnavigatorxobj.cpp
rename to engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
index 363283a1f01..6e4c0e3b21c 100644
--- a/engines/director/lingo/xlibs/mapnavigatorxobj.cpp
+++ b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/mapnavigatorxobj.h"
+#include "director/lingo/xlibs/m/mapnavigatorxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/mapnavigatorxobj.h b/engines/director/lingo/xlibs/m/mapnavigatorxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/mapnavigatorxobj.h
rename to engines/director/lingo/xlibs/m/mapnavigatorxobj.h
diff --git a/engines/director/lingo/xlibs/memcheckxobj.cpp b/engines/director/lingo/xlibs/m/memcheckxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/memcheckxobj.cpp
rename to engines/director/lingo/xlibs/m/memcheckxobj.cpp
index 3c279151f1d..3db4b42c460 100644
--- a/engines/director/lingo/xlibs/memcheckxobj.cpp
+++ b/engines/director/lingo/xlibs/m/memcheckxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/memcheckxobj.h"
+#include "director/lingo/xlibs/m/memcheckxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/memcheckxobj.h b/engines/director/lingo/xlibs/m/memcheckxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/memcheckxobj.h
rename to engines/director/lingo/xlibs/m/memcheckxobj.h
diff --git a/engines/director/lingo/xlibs/memoryxobj.cpp b/engines/director/lingo/xlibs/m/memoryxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/memoryxobj.cpp
rename to engines/director/lingo/xlibs/m/memoryxobj.cpp
index 8aa384a3b1d..4f13d3cb00c 100644
--- a/engines/director/lingo/xlibs/memoryxobj.cpp
+++ b/engines/director/lingo/xlibs/m/memoryxobj.cpp
@@ -60,7 +60,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/memoryxobj.h"
+#include "director/lingo/xlibs/m/memoryxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/memoryxobj.h b/engines/director/lingo/xlibs/m/memoryxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/memoryxobj.h
rename to engines/director/lingo/xlibs/m/memoryxobj.h
diff --git a/engines/director/lingo/xlibs/misc.cpp b/engines/director/lingo/xlibs/m/misc.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/misc.cpp
rename to engines/director/lingo/xlibs/m/misc.cpp
index 888023a1762..4aeab367b29 100644
--- a/engines/director/lingo/xlibs/misc.cpp
+++ b/engines/director/lingo/xlibs/m/misc.cpp
@@ -33,7 +33,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/misc.h"
+#include "director/lingo/xlibs/m/misc.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/misc.h b/engines/director/lingo/xlibs/m/misc.h
similarity index 100%
rename from engines/director/lingo/xlibs/misc.h
rename to engines/director/lingo/xlibs/m/misc.h
diff --git a/engines/director/lingo/xlibs/miscx.cpp b/engines/director/lingo/xlibs/m/miscx.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/miscx.cpp
rename to engines/director/lingo/xlibs/m/miscx.cpp
index b800d8373d4..8d57e9ae18d 100644
--- a/engines/director/lingo/xlibs/miscx.cpp
+++ b/engines/director/lingo/xlibs/m/miscx.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/miscx.h"
+#include "director/lingo/xlibs/m/miscx.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/miscx.h b/engines/director/lingo/xlibs/m/miscx.h
similarity index 100%
rename from engines/director/lingo/xlibs/miscx.h
rename to engines/director/lingo/xlibs/m/miscx.h
diff --git a/engines/director/lingo/xlibs/mmaskxobj.cpp b/engines/director/lingo/xlibs/m/mmaskxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/mmaskxobj.cpp
rename to engines/director/lingo/xlibs/m/mmaskxobj.cpp
index 8a0cba8aea5..a40a86e7edf 100644
--- a/engines/director/lingo/xlibs/mmaskxobj.cpp
+++ b/engines/director/lingo/xlibs/m/mmaskxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/mmaskxobj.h"
+#include "director/lingo/xlibs/m/mmaskxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/mmaskxobj.h b/engines/director/lingo/xlibs/m/mmaskxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/mmaskxobj.h
rename to engines/director/lingo/xlibs/m/mmaskxobj.h
diff --git a/engines/director/lingo/xlibs/mmovie.cpp b/engines/director/lingo/xlibs/m/mmovie.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/mmovie.cpp
rename to engines/director/lingo/xlibs/m/mmovie.cpp
index b4e5cfb6173..eeeb6b49783 100644
--- a/engines/director/lingo/xlibs/mmovie.cpp
+++ b/engines/director/lingo/xlibs/m/mmovie.cpp
@@ -31,7 +31,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/mmovie.h"
+#include "director/lingo/xlibs/m/mmovie.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/mmovie.h b/engines/director/lingo/xlibs/m/mmovie.h
similarity index 100%
rename from engines/director/lingo/xlibs/mmovie.h
rename to engines/director/lingo/xlibs/m/mmovie.h
diff --git a/engines/director/lingo/xlibs/moovxobj.cpp b/engines/director/lingo/xlibs/m/moovxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/moovxobj.cpp
rename to engines/director/lingo/xlibs/m/moovxobj.cpp
index 22dc7690076..c2938a8fd99 100644
--- a/engines/director/lingo/xlibs/moovxobj.cpp
+++ b/engines/director/lingo/xlibs/m/moovxobj.cpp
@@ -52,7 +52,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/moovxobj.h"
+#include "director/lingo/xlibs/m/moovxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/moovxobj.h b/engines/director/lingo/xlibs/m/moovxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/moovxobj.h
rename to engines/director/lingo/xlibs/m/moovxobj.h
diff --git a/engines/director/lingo/xlibs/movemousejp.cpp b/engines/director/lingo/xlibs/m/movemousejp.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/movemousejp.cpp
rename to engines/director/lingo/xlibs/m/movemousejp.cpp
index f52a97839d0..d80b698bc60 100644
--- a/engines/director/lingo/xlibs/movemousejp.cpp
+++ b/engines/director/lingo/xlibs/m/movemousejp.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/movemousejp.h"
+#include "director/lingo/xlibs/m/movemousejp.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/movemousejp.h b/engines/director/lingo/xlibs/m/movemousejp.h
similarity index 100%
rename from engines/director/lingo/xlibs/movemousejp.h
rename to engines/director/lingo/xlibs/m/movemousejp.h
diff --git a/engines/director/lingo/xlibs/movemousexobj.cpp b/engines/director/lingo/xlibs/m/movemousexobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/movemousexobj.cpp
rename to engines/director/lingo/xlibs/m/movemousexobj.cpp
index 2df6785f05d..56364ca26c1 100644
--- a/engines/director/lingo/xlibs/movemousexobj.cpp
+++ b/engines/director/lingo/xlibs/m/movemousexobj.cpp
@@ -24,7 +24,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/movemousexobj.h"
+#include "director/lingo/xlibs/m/movemousexobj.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/movemousexobj.h b/engines/director/lingo/xlibs/m/movemousexobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/movemousexobj.h
rename to engines/director/lingo/xlibs/m/movemousexobj.h
diff --git a/engines/director/lingo/xlibs/movieidxxobj.cpp b/engines/director/lingo/xlibs/m/movieidxxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/movieidxxobj.cpp
rename to engines/director/lingo/xlibs/m/movieidxxobj.cpp
index 494c59a1d05..588b994d7a1 100644
--- a/engines/director/lingo/xlibs/movieidxxobj.cpp
+++ b/engines/director/lingo/xlibs/m/movieidxxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/movieidxxobj.h"
+#include "director/lingo/xlibs/m/movieidxxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/movieidxxobj.h b/engines/director/lingo/xlibs/m/movieidxxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/movieidxxobj.h
rename to engines/director/lingo/xlibs/m/movieidxxobj.h
diff --git a/engines/director/lingo/xlibs/movutils.cpp b/engines/director/lingo/xlibs/m/movutils.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/movutils.cpp
rename to engines/director/lingo/xlibs/m/movutils.cpp
index 7b3c87d4c8f..b4c53cc79ca 100644
--- a/engines/director/lingo/xlibs/movutils.cpp
+++ b/engines/director/lingo/xlibs/m/movutils.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/movutils.h"
+#include "director/lingo/xlibs/m/movutils.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/movutils.h b/engines/director/lingo/xlibs/m/movutils.h
similarity index 100%
rename from engines/director/lingo/xlibs/movutils.h
rename to engines/director/lingo/xlibs/m/movutils.h
diff --git a/engines/director/lingo/xlibs/msfile.cpp b/engines/director/lingo/xlibs/m/msfile.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/msfile.cpp
rename to engines/director/lingo/xlibs/m/msfile.cpp
index 935b0a89674..08260a15a4a 100644
--- a/engines/director/lingo/xlibs/msfile.cpp
+++ b/engines/director/lingo/xlibs/m/msfile.cpp
@@ -30,7 +30,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/msfile.h"
+#include "director/lingo/xlibs/m/msfile.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/msfile.h b/engines/director/lingo/xlibs/m/msfile.h
similarity index 100%
rename from engines/director/lingo/xlibs/msfile.h
rename to engines/director/lingo/xlibs/m/msfile.h
diff --git a/engines/director/lingo/xlibs/mystisle.cpp b/engines/director/lingo/xlibs/m/mystisle.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/mystisle.cpp
rename to engines/director/lingo/xlibs/m/mystisle.cpp
index 8655e99527f..6df16c75e80 100644
--- a/engines/director/lingo/xlibs/mystisle.cpp
+++ b/engines/director/lingo/xlibs/m/mystisle.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/mystisle.h"
+#include "director/lingo/xlibs/m/mystisle.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/mystisle.h b/engines/director/lingo/xlibs/m/mystisle.h
similarity index 100%
rename from engines/director/lingo/xlibs/mystisle.h
rename to engines/director/lingo/xlibs/m/mystisle.h
diff --git a/engines/director/lingo/xlibs/openbleedwindowxcmd.cpp b/engines/director/lingo/xlibs/o/openbleedwindowxcmd.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/openbleedwindowxcmd.cpp
rename to engines/director/lingo/xlibs/o/openbleedwindowxcmd.cpp
index bfbe5121f5a..583b2821acf 100644
--- a/engines/director/lingo/xlibs/openbleedwindowxcmd.cpp
+++ b/engines/director/lingo/xlibs/o/openbleedwindowxcmd.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/openbleedwindowxcmd.h"
+#include "director/lingo/xlibs/o/openbleedwindowxcmd.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/openbleedwindowxcmd.h b/engines/director/lingo/xlibs/o/openbleedwindowxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/openbleedwindowxcmd.h
rename to engines/director/lingo/xlibs/o/openbleedwindowxcmd.h
diff --git a/engines/director/lingo/xlibs/orthoplayxobj.cpp b/engines/director/lingo/xlibs/o/orthoplayxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/orthoplayxobj.cpp
rename to engines/director/lingo/xlibs/o/orthoplayxobj.cpp
index b0abeaaf4ae..b9d6807744e 100644
--- a/engines/director/lingo/xlibs/orthoplayxobj.cpp
+++ b/engines/director/lingo/xlibs/o/orthoplayxobj.cpp
@@ -42,7 +42,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/orthoplayxobj.h"
+#include "director/lingo/xlibs/o/orthoplayxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/orthoplayxobj.h b/engines/director/lingo/xlibs/o/orthoplayxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/orthoplayxobj.h
rename to engines/director/lingo/xlibs/o/orthoplayxobj.h
diff --git a/engines/director/lingo/xlibs/paco.cpp b/engines/director/lingo/xlibs/p/paco.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/paco.cpp
rename to engines/director/lingo/xlibs/p/paco.cpp
index 17f38fe64eb..1a628791fab 100644
--- a/engines/director/lingo/xlibs/paco.cpp
+++ b/engines/director/lingo/xlibs/p/paco.cpp
@@ -29,7 +29,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/paco.h"
+#include "director/lingo/xlibs/p/paco.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/paco.h b/engines/director/lingo/xlibs/p/paco.h
similarity index 100%
rename from engines/director/lingo/xlibs/paco.h
rename to engines/director/lingo/xlibs/p/paco.h
diff --git a/engines/director/lingo/xlibs/palxobj.cpp b/engines/director/lingo/xlibs/p/palxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/palxobj.cpp
rename to engines/director/lingo/xlibs/p/palxobj.cpp
index f0d2723734c..7f42bf50afe 100644
--- a/engines/director/lingo/xlibs/palxobj.cpp
+++ b/engines/director/lingo/xlibs/p/palxobj.cpp
@@ -49,7 +49,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/palxobj.h"
+#include "director/lingo/xlibs/p/palxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/palxobj.h b/engines/director/lingo/xlibs/p/palxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/palxobj.h
rename to engines/director/lingo/xlibs/p/palxobj.h
diff --git a/engines/director/lingo/xlibs/panel.cpp b/engines/director/lingo/xlibs/p/panel.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/panel.cpp
rename to engines/director/lingo/xlibs/p/panel.cpp
index cebdf296c7b..92c6464501f 100644
--- a/engines/director/lingo/xlibs/panel.cpp
+++ b/engines/director/lingo/xlibs/p/panel.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/panel.h"
+#include "director/lingo/xlibs/p/panel.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/panel.h b/engines/director/lingo/xlibs/p/panel.h
similarity index 100%
rename from engines/director/lingo/xlibs/panel.h
rename to engines/director/lingo/xlibs/p/panel.h
diff --git a/engines/director/lingo/xlibs/pharaohs.cpp b/engines/director/lingo/xlibs/p/pharaohs.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/pharaohs.cpp
rename to engines/director/lingo/xlibs/p/pharaohs.cpp
index 5c2ac7238a6..22fa209209c 100644
--- a/engines/director/lingo/xlibs/pharaohs.cpp
+++ b/engines/director/lingo/xlibs/p/pharaohs.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/pharaohs.h"
+#include "director/lingo/xlibs/p/pharaohs.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/pharaohs.h b/engines/director/lingo/xlibs/p/pharaohs.h
similarity index 100%
rename from engines/director/lingo/xlibs/pharaohs.h
rename to engines/director/lingo/xlibs/p/pharaohs.h
diff --git a/engines/director/lingo/xlibs/popupmenuxobj.cpp b/engines/director/lingo/xlibs/p/popupmenuxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/popupmenuxobj.cpp
rename to engines/director/lingo/xlibs/p/popupmenuxobj.cpp
index 1914ec46e53..f732b84bf51 100644
--- a/engines/director/lingo/xlibs/popupmenuxobj.cpp
+++ b/engines/director/lingo/xlibs/p/popupmenuxobj.cpp
@@ -107,7 +107,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/popupmenuxobj.h"
+#include "director/lingo/xlibs/p/popupmenuxobj.h"
#include "graphics/macgui/macpopupmenu.h"
diff --git a/engines/director/lingo/xlibs/popupmenuxobj.h b/engines/director/lingo/xlibs/p/popupmenuxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/popupmenuxobj.h
rename to engines/director/lingo/xlibs/p/popupmenuxobj.h
diff --git a/engines/director/lingo/xlibs/porta.cpp b/engines/director/lingo/xlibs/p/porta.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/porta.cpp
rename to engines/director/lingo/xlibs/p/porta.cpp
index ab881001696..ce932382518 100644
--- a/engines/director/lingo/xlibs/porta.cpp
+++ b/engines/director/lingo/xlibs/p/porta.cpp
@@ -22,7 +22,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/porta.h"
+#include "director/lingo/xlibs/p/porta.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/porta.h b/engines/director/lingo/xlibs/p/porta.h
similarity index 100%
rename from engines/director/lingo/xlibs/porta.h
rename to engines/director/lingo/xlibs/p/porta.h
diff --git a/engines/director/lingo/xlibs/prefpath.cpp b/engines/director/lingo/xlibs/p/prefpath.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/prefpath.cpp
rename to engines/director/lingo/xlibs/p/prefpath.cpp
index 06695c4bce4..5b7c9e7891b 100644
--- a/engines/director/lingo/xlibs/prefpath.cpp
+++ b/engines/director/lingo/xlibs/p/prefpath.cpp
@@ -35,7 +35,7 @@ SS mPrefPath
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/prefpath.h"
+#include "director/lingo/xlibs/p/prefpath.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/prefpath.h b/engines/director/lingo/xlibs/p/prefpath.h
similarity index 100%
rename from engines/director/lingo/xlibs/prefpath.h
rename to engines/director/lingo/xlibs/p/prefpath.h
diff --git a/engines/director/lingo/xlibs/printomatic.cpp b/engines/director/lingo/xlibs/p/printomatic.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/printomatic.cpp
rename to engines/director/lingo/xlibs/p/printomatic.cpp
index f60da6f0e6b..467dc13054e 100644
--- a/engines/director/lingo/xlibs/printomatic.cpp
+++ b/engines/director/lingo/xlibs/p/printomatic.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/printomatic.h"
+#include "director/lingo/xlibs/p/printomatic.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/printomatic.h b/engines/director/lingo/xlibs/p/printomatic.h
similarity index 100%
rename from engines/director/lingo/xlibs/printomatic.h
rename to engines/director/lingo/xlibs/p/printomatic.h
diff --git a/engines/director/lingo/xlibs/processxobj.cpp b/engines/director/lingo/xlibs/p/processxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/processxobj.cpp
rename to engines/director/lingo/xlibs/p/processxobj.cpp
index 53bf8db84d9..6e55666a135 100644
--- a/engines/director/lingo/xlibs/processxobj.cpp
+++ b/engines/director/lingo/xlibs/p/processxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/processxobj.h"
+#include "director/lingo/xlibs/p/processxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/processxobj.h b/engines/director/lingo/xlibs/p/processxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/processxobj.h
rename to engines/director/lingo/xlibs/p/processxobj.h
diff --git a/engines/director/lingo/xlibs/putcurs.cpp b/engines/director/lingo/xlibs/p/putcurs.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/putcurs.cpp
rename to engines/director/lingo/xlibs/p/putcurs.cpp
index 95420e0fe6a..86c82f77e04 100644
--- a/engines/director/lingo/xlibs/putcurs.cpp
+++ b/engines/director/lingo/xlibs/p/putcurs.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/putcurs.h"
+#include "director/lingo/xlibs/p/putcurs.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/putcurs.h b/engines/director/lingo/xlibs/p/putcurs.h
similarity index 100%
rename from engines/director/lingo/xlibs/putcurs.h
rename to engines/director/lingo/xlibs/p/putcurs.h
diff --git a/engines/director/lingo/xlibs/qtcatmovieplayerxobj.cpp b/engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/qtcatmovieplayerxobj.cpp
rename to engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.cpp
index a8be59b6beb..e6bd249a8ae 100644
--- a/engines/director/lingo/xlibs/qtcatmovieplayerxobj.cpp
+++ b/engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/qtcatmovieplayerxobj.h"
+#include "director/lingo/xlibs/q/qtcatmovieplayerxobj.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/qtcatmovieplayerxobj.h b/engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/qtcatmovieplayerxobj.h
rename to engines/director/lingo/xlibs/q/qtcatmovieplayerxobj.h
diff --git a/engines/director/lingo/xlibs/qtmovie.cpp b/engines/director/lingo/xlibs/q/qtmovie.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/qtmovie.cpp
rename to engines/director/lingo/xlibs/q/qtmovie.cpp
index 8f961e605a0..c0f284469d5 100644
--- a/engines/director/lingo/xlibs/qtmovie.cpp
+++ b/engines/director/lingo/xlibs/q/qtmovie.cpp
@@ -34,7 +34,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/qtmovie.h"
+#include "director/lingo/xlibs/q/qtmovie.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/qtmovie.h b/engines/director/lingo/xlibs/q/qtmovie.h
similarity index 100%
rename from engines/director/lingo/xlibs/qtmovie.h
rename to engines/director/lingo/xlibs/q/qtmovie.h
diff --git a/engines/director/lingo/xlibs/qtvr.cpp b/engines/director/lingo/xlibs/q/qtvr.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/qtvr.cpp
rename to engines/director/lingo/xlibs/q/qtvr.cpp
index 1f1fe78957b..42e45dfbc6e 100644
--- a/engines/director/lingo/xlibs/qtvr.cpp
+++ b/engines/director/lingo/xlibs/q/qtvr.cpp
@@ -58,7 +58,7 @@
#include "director/lingo/lingo-code.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/qtvr.h"
+#include "director/lingo/xlibs/q/qtvr.h"
#include "director/window.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/qtvr.h b/engines/director/lingo/xlibs/q/qtvr.h
similarity index 100%
rename from engines/director/lingo/xlibs/qtvr.h
rename to engines/director/lingo/xlibs/q/qtvr.h
diff --git a/engines/director/lingo/xlibs/quicktime.cpp b/engines/director/lingo/xlibs/q/quicktime.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/quicktime.cpp
rename to engines/director/lingo/xlibs/q/quicktime.cpp
index 45928e780f3..c9ae2c9e1ec 100644
--- a/engines/director/lingo/xlibs/quicktime.cpp
+++ b/engines/director/lingo/xlibs/q/quicktime.cpp
@@ -31,7 +31,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/quicktime.h"
+#include "director/lingo/xlibs/q/quicktime.h"
#include "video/qt_decoder.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/quicktime.h b/engines/director/lingo/xlibs/q/quicktime.h
similarity index 100%
rename from engines/director/lingo/xlibs/quicktime.h
rename to engines/director/lingo/xlibs/q/quicktime.h
diff --git a/engines/director/lingo/xlibs/registercomponent.cpp b/engines/director/lingo/xlibs/r/registercomponent.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/registercomponent.cpp
rename to engines/director/lingo/xlibs/r/registercomponent.cpp
index 1900bb2bdeb..f8eec159d63 100644
--- a/engines/director/lingo/xlibs/registercomponent.cpp
+++ b/engines/director/lingo/xlibs/r/registercomponent.cpp
@@ -22,7 +22,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/registercomponent.h"
+#include "director/lingo/xlibs/r/registercomponent.h"
/*************************************
*
diff --git a/engines/director/lingo/xlibs/registercomponent.h b/engines/director/lingo/xlibs/r/registercomponent.h
similarity index 100%
rename from engines/director/lingo/xlibs/registercomponent.h
rename to engines/director/lingo/xlibs/r/registercomponent.h
diff --git a/engines/director/lingo/xlibs/remixxcmd.cpp b/engines/director/lingo/xlibs/r/remixxcmd.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/remixxcmd.cpp
rename to engines/director/lingo/xlibs/r/remixxcmd.cpp
index 29ce7ac6e09..a2b0ea04e8b 100644
--- a/engines/director/lingo/xlibs/remixxcmd.cpp
+++ b/engines/director/lingo/xlibs/r/remixxcmd.cpp
@@ -27,7 +27,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/remixxcmd.h"
+#include "director/lingo/xlibs/r/remixxcmd.h"
#include "director/sound.h"
#include "director/types.h"
#include "director/window.h"
diff --git a/engines/director/lingo/xlibs/remixxcmd.h b/engines/director/lingo/xlibs/r/remixxcmd.h
similarity index 100%
rename from engines/director/lingo/xlibs/remixxcmd.h
rename to engines/director/lingo/xlibs/r/remixxcmd.h
diff --git a/engines/director/lingo/xlibs/serialportxobj.cpp b/engines/director/lingo/xlibs/s/serialportxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/serialportxobj.cpp
rename to engines/director/lingo/xlibs/s/serialportxobj.cpp
index 0166ad1c458..518ff3d1fe0 100644
--- a/engines/director/lingo/xlibs/serialportxobj.cpp
+++ b/engines/director/lingo/xlibs/s/serialportxobj.cpp
@@ -39,7 +39,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/serialportxobj.h"
+#include "director/lingo/xlibs/s/serialportxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/serialportxobj.h b/engines/director/lingo/xlibs/s/serialportxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/serialportxobj.h
rename to engines/director/lingo/xlibs/s/serialportxobj.h
diff --git a/engines/director/lingo/xlibs/smallutil.cpp b/engines/director/lingo/xlibs/s/smallutil.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/smallutil.cpp
rename to engines/director/lingo/xlibs/s/smallutil.cpp
index f10b0727f96..0aae096add5 100644
--- a/engines/director/lingo/xlibs/smallutil.cpp
+++ b/engines/director/lingo/xlibs/s/smallutil.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/smallutil.h"
+#include "director/lingo/xlibs/s/smallutil.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/smallutil.h b/engines/director/lingo/xlibs/s/smallutil.h
similarity index 100%
rename from engines/director/lingo/xlibs/smallutil.h
rename to engines/director/lingo/xlibs/s/smallutil.h
diff --git a/engines/director/lingo/xlibs/soundjam.cpp b/engines/director/lingo/xlibs/s/soundjam.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/soundjam.cpp
rename to engines/director/lingo/xlibs/s/soundjam.cpp
index d5e2585bbb2..a7b39f4b497 100644
--- a/engines/director/lingo/xlibs/soundjam.cpp
+++ b/engines/director/lingo/xlibs/s/soundjam.cpp
@@ -49,7 +49,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/soundjam.h"
+#include "director/lingo/xlibs/s/soundjam.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/soundjam.h b/engines/director/lingo/xlibs/s/soundjam.h
similarity index 100%
rename from engines/director/lingo/xlibs/soundjam.h
rename to engines/director/lingo/xlibs/s/soundjam.h
diff --git a/engines/director/lingo/xlibs/spacemgr.cpp b/engines/director/lingo/xlibs/s/spacemgr.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/spacemgr.cpp
rename to engines/director/lingo/xlibs/s/spacemgr.cpp
index 61965195edd..d2348aef582 100644
--- a/engines/director/lingo/xlibs/spacemgr.cpp
+++ b/engines/director/lingo/xlibs/s/spacemgr.cpp
@@ -78,7 +78,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/spacemgr.h"
+#include "director/lingo/xlibs/s/spacemgr.h"
#include "director/util.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/spacemgr.h b/engines/director/lingo/xlibs/s/spacemgr.h
similarity index 100%
rename from engines/director/lingo/xlibs/spacemgr.h
rename to engines/director/lingo/xlibs/s/spacemgr.h
diff --git a/engines/director/lingo/xlibs/stagetc.cpp b/engines/director/lingo/xlibs/s/stagetc.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/stagetc.cpp
rename to engines/director/lingo/xlibs/s/stagetc.cpp
index 2a8333a9f09..e3f5a61dd80 100644
--- a/engines/director/lingo/xlibs/stagetc.cpp
+++ b/engines/director/lingo/xlibs/s/stagetc.cpp
@@ -35,7 +35,7 @@ I mGetHandle --Copies a portion of the stage onto a cast member
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/stagetc.h"
+#include "director/lingo/xlibs/s/stagetc.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/stagetc.h b/engines/director/lingo/xlibs/s/stagetc.h
similarity index 100%
rename from engines/director/lingo/xlibs/stagetc.h
rename to engines/director/lingo/xlibs/s/stagetc.h
diff --git a/engines/director/lingo/xlibs/syscolor.cpp b/engines/director/lingo/xlibs/s/syscolor.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/syscolor.cpp
rename to engines/director/lingo/xlibs/s/syscolor.cpp
index 3ff40434575..4040d661314 100644
--- a/engines/director/lingo/xlibs/syscolor.cpp
+++ b/engines/director/lingo/xlibs/s/syscolor.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/syscolor.h"
+#include "director/lingo/xlibs/s/syscolor.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/syscolor.h b/engines/director/lingo/xlibs/s/syscolor.h
similarity index 100%
rename from engines/director/lingo/xlibs/syscolor.h
rename to engines/director/lingo/xlibs/s/syscolor.h
diff --git a/engines/director/lingo/xlibs/tengu.cpp b/engines/director/lingo/xlibs/t/tengu.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/tengu.cpp
rename to engines/director/lingo/xlibs/t/tengu.cpp
index fff2b52935e..4899cdb589d 100644
--- a/engines/director/lingo/xlibs/tengu.cpp
+++ b/engines/director/lingo/xlibs/t/tengu.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/tengu.h"
+#include "director/lingo/xlibs/t/tengu.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/tengu.h b/engines/director/lingo/xlibs/t/tengu.h
similarity index 100%
rename from engines/director/lingo/xlibs/tengu.h
rename to engines/director/lingo/xlibs/t/tengu.h
diff --git a/engines/director/lingo/xlibs/unittest.cpp b/engines/director/lingo/xlibs/u/unittest.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/unittest.cpp
rename to engines/director/lingo/xlibs/u/unittest.cpp
index ed1453e8389..34b7f0a4f9c 100644
--- a/engines/director/lingo/xlibs/unittest.cpp
+++ b/engines/director/lingo/xlibs/u/unittest.cpp
@@ -31,7 +31,7 @@
#include "director/archive.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/unittest.h"
+#include "director/lingo/xlibs/u/unittest.h"
#include "director/movie.h"
#include "director/score.h"
#include "director/window.h"
diff --git a/engines/director/lingo/xlibs/unittest.h b/engines/director/lingo/xlibs/u/unittest.h
similarity index 100%
rename from engines/director/lingo/xlibs/unittest.h
rename to engines/director/lingo/xlibs/u/unittest.h
diff --git a/engines/director/lingo/xlibs/valkyrie.cpp b/engines/director/lingo/xlibs/v/valkyrie.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/valkyrie.cpp
rename to engines/director/lingo/xlibs/v/valkyrie.cpp
index a44fc74d390..46e4ff377b0 100644
--- a/engines/director/lingo/xlibs/valkyrie.cpp
+++ b/engines/director/lingo/xlibs/v/valkyrie.cpp
@@ -42,7 +42,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/valkyrie.h"
+#include "director/lingo/xlibs/v/valkyrie.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/valkyrie.h b/engines/director/lingo/xlibs/v/valkyrie.h
similarity index 100%
rename from engines/director/lingo/xlibs/valkyrie.h
rename to engines/director/lingo/xlibs/v/valkyrie.h
diff --git a/engines/director/lingo/xlibs/versions.cpp b/engines/director/lingo/xlibs/v/versions.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/versions.cpp
rename to engines/director/lingo/xlibs/v/versions.cpp
index 5c8fae89853..6f959cb28b8 100644
--- a/engines/director/lingo/xlibs/versions.cpp
+++ b/engines/director/lingo/xlibs/v/versions.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/versions.h"
+#include "director/lingo/xlibs/v/versions.h"
/**************************************************
*
@@ -174,7 +174,7 @@ SS mGetLongFileName, theFile
-- XObject .DLL (these files are distributed with this XObject).
-- Returns EMPTY if 32-bit environment is unavailable, or ASK32.EXE
-- can't load; Returns string with word 1 'Error:' if ASK32.EXE fails.
---
+--
*/
namespace Director {
diff --git a/engines/director/lingo/xlibs/versions.h b/engines/director/lingo/xlibs/v/versions.h
similarity index 100%
rename from engines/director/lingo/xlibs/versions.h
rename to engines/director/lingo/xlibs/v/versions.h
diff --git a/engines/director/lingo/xlibs/videodiscxobj.cpp b/engines/director/lingo/xlibs/v/videodiscxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/videodiscxobj.cpp
rename to engines/director/lingo/xlibs/v/videodiscxobj.cpp
index 16572bdc2d1..23fa870c802 100644
--- a/engines/director/lingo/xlibs/videodiscxobj.cpp
+++ b/engines/director/lingo/xlibs/v/videodiscxobj.cpp
@@ -111,7 +111,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/videodiscxobj.h"
+#include "director/lingo/xlibs/v/videodiscxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/videodiscxobj.h b/engines/director/lingo/xlibs/v/videodiscxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/videodiscxobj.h
rename to engines/director/lingo/xlibs/v/videodiscxobj.h
diff --git a/engines/director/lingo/xlibs/vmisonxfcn.cpp b/engines/director/lingo/xlibs/v/vmisonxfcn.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/vmisonxfcn.cpp
rename to engines/director/lingo/xlibs/v/vmisonxfcn.cpp
index 8950ef65959..f9d21660efc 100644
--- a/engines/director/lingo/xlibs/vmisonxfcn.cpp
+++ b/engines/director/lingo/xlibs/v/vmisonxfcn.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/vmisonxfcn.h"
+#include "director/lingo/xlibs/v/vmisonxfcn.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/vmisonxfcn.h b/engines/director/lingo/xlibs/v/vmisonxfcn.h
similarity index 100%
rename from engines/director/lingo/xlibs/vmisonxfcn.h
rename to engines/director/lingo/xlibs/v/vmisonxfcn.h
diff --git a/engines/director/lingo/xlibs/vmpresent.cpp b/engines/director/lingo/xlibs/v/vmpresent.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/vmpresent.cpp
rename to engines/director/lingo/xlibs/v/vmpresent.cpp
index 8e72d9d93cf..27a215a9691 100644
--- a/engines/director/lingo/xlibs/vmpresent.cpp
+++ b/engines/director/lingo/xlibs/v/vmpresent.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/vmpresent.h"
+#include "director/lingo/xlibs/v/vmpresent.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/vmpresent.h b/engines/director/lingo/xlibs/v/vmpresent.h
similarity index 100%
rename from engines/director/lingo/xlibs/vmpresent.h
rename to engines/director/lingo/xlibs/v/vmpresent.h
diff --git a/engines/director/lingo/xlibs/volumelist.cpp b/engines/director/lingo/xlibs/v/volumelist.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/volumelist.cpp
rename to engines/director/lingo/xlibs/v/volumelist.cpp
index 2ad69d48d69..0e8d1adc395 100644
--- a/engines/director/lingo/xlibs/volumelist.cpp
+++ b/engines/director/lingo/xlibs/v/volumelist.cpp
@@ -34,7 +34,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/volumelist.h"
+#include "director/lingo/xlibs/v/volumelist.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/volumelist.h b/engines/director/lingo/xlibs/v/volumelist.h
similarity index 100%
rename from engines/director/lingo/xlibs/volumelist.h
rename to engines/director/lingo/xlibs/v/volumelist.h
diff --git a/engines/director/lingo/xlibs/voyagerxsound.cpp b/engines/director/lingo/xlibs/v/voyagerxsound.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/voyagerxsound.cpp
rename to engines/director/lingo/xlibs/v/voyagerxsound.cpp
index d8b8e30458d..f39e4639f2d 100644
--- a/engines/director/lingo/xlibs/voyagerxsound.cpp
+++ b/engines/director/lingo/xlibs/v/voyagerxsound.cpp
@@ -28,7 +28,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/voyagerxsound.h"
+#include "director/lingo/xlibs/v/voyagerxsound.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/voyagerxsound.h b/engines/director/lingo/xlibs/v/voyagerxsound.h
similarity index 100%
rename from engines/director/lingo/xlibs/voyagerxsound.h
rename to engines/director/lingo/xlibs/v/voyagerxsound.h
diff --git a/engines/director/lingo/xlibs/widgetxobj.cpp b/engines/director/lingo/xlibs/w/widgetxobj.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/widgetxobj.cpp
rename to engines/director/lingo/xlibs/w/widgetxobj.cpp
index f3ac5c468f6..d22b60fb761 100644
--- a/engines/director/lingo/xlibs/widgetxobj.cpp
+++ b/engines/director/lingo/xlibs/w/widgetxobj.cpp
@@ -40,7 +40,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/widgetxobj.h"
+#include "director/lingo/xlibs/w/widgetxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/widgetxobj.h b/engines/director/lingo/xlibs/w/widgetxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/widgetxobj.h
rename to engines/director/lingo/xlibs/w/widgetxobj.h
diff --git a/engines/director/lingo/xlibs/window.cpp b/engines/director/lingo/xlibs/w/window.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/window.cpp
rename to engines/director/lingo/xlibs/w/window.cpp
index a38554dfc6d..5b176d45721 100644
--- a/engines/director/lingo/xlibs/window.cpp
+++ b/engines/director/lingo/xlibs/w/window.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/window.h"
+#include "director/lingo/xlibs/w/window.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/window.h b/engines/director/lingo/xlibs/w/window.h
similarity index 100%
rename from engines/director/lingo/xlibs/window.h
rename to engines/director/lingo/xlibs/w/window.h
diff --git a/engines/director/lingo/xlibs/wininfo.cpp b/engines/director/lingo/xlibs/w/wininfo.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/wininfo.cpp
rename to engines/director/lingo/xlibs/w/wininfo.cpp
index 43cefc6d52f..800573f11a6 100644
--- a/engines/director/lingo/xlibs/wininfo.cpp
+++ b/engines/director/lingo/xlibs/w/wininfo.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/wininfo.h"
+#include "director/lingo/xlibs/w/wininfo.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/wininfo.h b/engines/director/lingo/xlibs/w/wininfo.h
similarity index 100%
rename from engines/director/lingo/xlibs/wininfo.h
rename to engines/director/lingo/xlibs/w/wininfo.h
diff --git a/engines/director/lingo/xlibs/winxobj.cpp b/engines/director/lingo/xlibs/w/winxobj.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/winxobj.cpp
rename to engines/director/lingo/xlibs/w/winxobj.cpp
index 776d4ed1a69..4ea1156b598 100644
--- a/engines/director/lingo/xlibs/winxobj.cpp
+++ b/engines/director/lingo/xlibs/w/winxobj.cpp
@@ -39,7 +39,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/winxobj.h"
+#include "director/lingo/xlibs/w/winxobj.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/winxobj.h b/engines/director/lingo/xlibs/w/winxobj.h
similarity index 100%
rename from engines/director/lingo/xlibs/winxobj.h
rename to engines/director/lingo/xlibs/w/winxobj.h
diff --git a/engines/director/lingo/xlibs/xcmdglue.cpp b/engines/director/lingo/xlibs/x/xcmdglue.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/xcmdglue.cpp
rename to engines/director/lingo/xlibs/x/xcmdglue.cpp
index 11e56aef4a7..224e8aafb16 100644
--- a/engines/director/lingo/xlibs/xcmdglue.cpp
+++ b/engines/director/lingo/xlibs/x/xcmdglue.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/xcmdglue.h"
+#include "director/lingo/xlibs/x/xcmdglue.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/xcmdglue.h b/engines/director/lingo/xlibs/x/xcmdglue.h
similarity index 100%
rename from engines/director/lingo/xlibs/xcmdglue.h
rename to engines/director/lingo/xlibs/x/xcmdglue.h
diff --git a/engines/director/lingo/xlibs/xio.cpp b/engines/director/lingo/xlibs/x/xio.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/xio.cpp
rename to engines/director/lingo/xlibs/x/xio.cpp
index 9c3c9da1b1a..f58a44daf83 100644
--- a/engines/director/lingo/xlibs/xio.cpp
+++ b/engines/director/lingo/xlibs/x/xio.cpp
@@ -40,7 +40,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/xio.h"
+#include "director/lingo/xlibs/x/xio.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/xio.h b/engines/director/lingo/xlibs/x/xio.h
similarity index 100%
rename from engines/director/lingo/xlibs/xio.h
rename to engines/director/lingo/xlibs/x/xio.h
diff --git a/engines/director/lingo/xlibs/xplayanim.cpp b/engines/director/lingo/xlibs/x/xplayanim.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/xplayanim.cpp
rename to engines/director/lingo/xlibs/x/xplayanim.cpp
index 155b4eb5dff..41e4b074810 100644
--- a/engines/director/lingo/xlibs/xplayanim.cpp
+++ b/engines/director/lingo/xlibs/x/xplayanim.cpp
@@ -32,7 +32,7 @@
#include "director/window.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/xplayanim.h"
+#include "director/lingo/xlibs/x/xplayanim.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/xplayanim.h b/engines/director/lingo/xlibs/x/xplayanim.h
similarity index 100%
rename from engines/director/lingo/xlibs/xplayanim.h
rename to engines/director/lingo/xlibs/x/xplayanim.h
diff --git a/engines/director/lingo/xlibs/xplaypacoxfcn.cpp b/engines/director/lingo/xlibs/x/xplaypacoxfcn.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/xplaypacoxfcn.cpp
rename to engines/director/lingo/xlibs/x/xplaypacoxfcn.cpp
index e0ebca38491..31f10725ed9 100644
--- a/engines/director/lingo/xlibs/xplaypacoxfcn.cpp
+++ b/engines/director/lingo/xlibs/x/xplaypacoxfcn.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/xplaypacoxfcn.h"
+#include "director/lingo/xlibs/x/xplaypacoxfcn.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/xplaypacoxfcn.h b/engines/director/lingo/xlibs/x/xplaypacoxfcn.h
similarity index 100%
rename from engines/director/lingo/xlibs/xplaypacoxfcn.h
rename to engines/director/lingo/xlibs/x/xplaypacoxfcn.h
diff --git a/engines/director/lingo/xlibs/xsoundxfcn.cpp b/engines/director/lingo/xlibs/x/xsoundxfcn.cpp
similarity index 98%
rename from engines/director/lingo/xlibs/xsoundxfcn.cpp
rename to engines/director/lingo/xlibs/x/xsoundxfcn.cpp
index 91c8e0e00c2..53b7096c191 100644
--- a/engines/director/lingo/xlibs/xsoundxfcn.cpp
+++ b/engines/director/lingo/xlibs/x/xsoundxfcn.cpp
@@ -25,8 +25,8 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/voyagerxsound.h"
-#include "director/lingo/xlibs/xsoundxfcn.h"
+#include "director/lingo/xlibs/v/voyagerxsound.h"
+#include "director/lingo/xlibs/x/xsoundxfcn.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/xsoundxfcn.h b/engines/director/lingo/xlibs/x/xsoundxfcn.h
similarity index 100%
rename from engines/director/lingo/xlibs/xsoundxfcn.h
rename to engines/director/lingo/xlibs/x/xsoundxfcn.h
diff --git a/engines/director/lingo/xlibs/xwin.cpp b/engines/director/lingo/xlibs/x/xwin.cpp
similarity index 99%
rename from engines/director/lingo/xlibs/xwin.cpp
rename to engines/director/lingo/xlibs/x/xwin.cpp
index 8adba65d968..0984751d4ab 100644
--- a/engines/director/lingo/xlibs/xwin.cpp
+++ b/engines/director/lingo/xlibs/x/xwin.cpp
@@ -25,7 +25,7 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/xwin.h"
+#include "director/lingo/xlibs/x/xwin.h"
/**************************************************
*
diff --git a/engines/director/lingo/xlibs/xwin.h b/engines/director/lingo/xlibs/x/xwin.h
similarity index 100%
rename from engines/director/lingo/xlibs/xwin.h
rename to engines/director/lingo/xlibs/x/xwin.h
diff --git a/engines/director/lingo/xlibs/yasix.cpp b/engines/director/lingo/xlibs/y/yasix.cpp
similarity index 97%
rename from engines/director/lingo/xlibs/yasix.cpp
rename to engines/director/lingo/xlibs/y/yasix.cpp
index 007d13501d5..eaa3a3fc7f2 100644
--- a/engines/director/lingo/xlibs/yasix.cpp
+++ b/engines/director/lingo/xlibs/y/yasix.cpp
@@ -33,7 +33,7 @@
#include "director/director.h"
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
-#include "director/lingo/xlibs/yasix.h"
+#include "director/lingo/xlibs/y/yasix.h"
namespace Director {
diff --git a/engines/director/lingo/xlibs/yasix.h b/engines/director/lingo/xlibs/y/yasix.h
similarity index 100%
rename from engines/director/lingo/xlibs/yasix.h
rename to engines/director/lingo/xlibs/y/yasix.h
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 45d46dbbdff..047a956a6fb 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -62,120 +62,120 @@ MODULE_OBJS = \
lingo/lingodec/handler.o \
lingo/lingodec/names.o \
lingo/lingodec/script.o \
- lingo/xlibs/aiff.o \
- lingo/xlibs/applecdxobj.o \
- lingo/xlibs/askuser.o \
- lingo/xlibs/backdrop.o \
- lingo/xlibs/barakeobj.o \
- lingo/xlibs/batqt.o \
- lingo/xlibs/bimxobj.o \
- lingo/xlibs/blitpict.o \
- lingo/xlibs/cdromxobj.o \
- lingo/xlibs/closebleedwindowxcmd.o \
- lingo/xlibs/colorxobj.o \
- lingo/xlibs/colorcursorxobj.o \
- lingo/xlibs/consumer.o \
- lingo/xlibs/cursorxobj.o \
- lingo/xlibs/darkenscreen.o \
- lingo/xlibs/dateutil.o \
- lingo/xlibs/developerStack.o \
- lingo/xlibs/dialogsxobj.o \
- lingo/xlibs/dirutil.o \
- lingo/xlibs/dllglue.o \
- lingo/xlibs/dpwavi.o \
- lingo/xlibs/dpwqtw.o \
- lingo/xlibs/draw.o \
- lingo/xlibs/ednox.o \
- lingo/xlibs/eventq.o \
- lingo/xlibs/fadegammadownxcmd.o \
- lingo/xlibs/fadegammaupxcmd.o \
- lingo/xlibs/fadegammaxcmd.o \
- lingo/xlibs/fedracul.o \
- lingo/xlibs/feimasks.o \
- lingo/xlibs/feiprefs.o \
- lingo/xlibs/fileexists.o \
- lingo/xlibs/fileio.o \
- lingo/xlibs/findereventsxcmd.o \
- lingo/xlibs/findfolder.o \
- lingo/xlibs/findsys.o \
- lingo/xlibs/findwin.o \
- lingo/xlibs/flushxobj.o \
- lingo/xlibs/fplayxobj.o \
- lingo/xlibs/fsutil.o \
- lingo/xlibs/genutils.o \
- lingo/xlibs/getscreenrectsxfcn.o \
- lingo/xlibs/getscreensizexfcn.o \
- lingo/xlibs/getsoundinlevel.o \
- lingo/xlibs/gpid.o \
- lingo/xlibs/henry.o \
- lingo/xlibs/hitmap.o \
- lingo/xlibs/inixobj.o \
- lingo/xlibs/instobj.o \
- lingo/xlibs/iscd.o \
- lingo/xlibs/ispippin.o \
- lingo/xlibs/jitdraw3.o \
- lingo/xlibs/jwxini.o \
- lingo/xlibs/labeldrvxobj.o \
- lingo/xlibs/listdev.o \
- lingo/xlibs/maniacbg.o \
- lingo/xlibs/mapnavigatorxobj.o \
- lingo/xlibs/memcheckxobj.o \
- lingo/xlibs/memoryxobj.o \
- lingo/xlibs/misc.o \
- lingo/xlibs/miscx.o \
- lingo/xlibs/mmaskxobj.o \
- lingo/xlibs/mmovie.o \
- lingo/xlibs/moovxobj.o \
- lingo/xlibs/movemousejp.o \
- lingo/xlibs/movemousexobj.o \
- lingo/xlibs/movieidxxobj.o \
- lingo/xlibs/movutils.o \
- lingo/xlibs/msfile.o \
- lingo/xlibs/mystisle.o \
- lingo/xlibs/openbleedwindowxcmd.o \
- lingo/xlibs/orthoplayxobj.o \
- lingo/xlibs/paco.o \
- lingo/xlibs/palxobj.o \
- lingo/xlibs/panel.o \
- lingo/xlibs/pharaohs.o \
- lingo/xlibs/popupmenuxobj.o \
- lingo/xlibs/porta.o \
- lingo/xlibs/prefpath.o \
- lingo/xlibs/printomatic.o \
- lingo/xlibs/processxobj.o \
- lingo/xlibs/putcurs.o \
- lingo/xlibs/qtcatmovieplayerxobj.o \
- lingo/xlibs/qtmovie.o \
- lingo/xlibs/qtvr.o \
- lingo/xlibs/quicktime.o \
- lingo/xlibs/registercomponent.o \
- lingo/xlibs/remixxcmd.o \
- lingo/xlibs/serialportxobj.o \
- lingo/xlibs/smallutil.o \
- lingo/xlibs/soundjam.o \
- lingo/xlibs/spacemgr.o \
- lingo/xlibs/stagetc.o \
- lingo/xlibs/syscolor.o \
- lingo/xlibs/tengu.o \
- lingo/xlibs/unittest.o \
- lingo/xlibs/valkyrie.o \
- lingo/xlibs/versions.o \
- lingo/xlibs/videodiscxobj.o \
- lingo/xlibs/vmisonxfcn.o \
- lingo/xlibs/vmpresent.o \
- lingo/xlibs/volumelist.o \
- lingo/xlibs/voyagerxsound.o \
- lingo/xlibs/widgetxobj.o \
- lingo/xlibs/window.o \
- lingo/xlibs/winxobj.o \
- lingo/xlibs/wininfo.o \
- lingo/xlibs/xcmdglue.o \
- lingo/xlibs/xio.o \
- lingo/xlibs/xplayanim.o \
- lingo/xlibs/xplaypacoxfcn.o \
- lingo/xlibs/xsoundxfcn.o \
- lingo/xlibs/xwin.o \
- lingo/xlibs/yasix.o \
+ lingo/xlibs/a/aiff.o \
+ lingo/xlibs/a/applecdxobj.o \
+ lingo/xlibs/a/askuser.o \
+ lingo/xlibs/b/backdrop.o \
+ lingo/xlibs/b/barakeobj.o \
+ lingo/xlibs/b/batqt.o \
+ lingo/xlibs/b/bimxobj.o \
+ lingo/xlibs/b/blitpict.o \
+ lingo/xlibs/c/cdromxobj.o \
+ lingo/xlibs/c/closebleedwindowxcmd.o \
+ lingo/xlibs/c/colorxobj.o \
+ lingo/xlibs/c/colorcursorxobj.o \
+ lingo/xlibs/c/consumer.o \
+ lingo/xlibs/c/cursorxobj.o \
+ lingo/xlibs/d/darkenscreen.o \
+ lingo/xlibs/d/dateutil.o \
+ lingo/xlibs/d/developerStack.o \
+ lingo/xlibs/d/dialogsxobj.o \
+ lingo/xlibs/d/dirutil.o \
+ lingo/xlibs/d/dllglue.o \
+ lingo/xlibs/d/dpwavi.o \
+ lingo/xlibs/d/dpwqtw.o \
+ lingo/xlibs/d/draw.o \
+ lingo/xlibs/e/ednox.o \
+ lingo/xlibs/e/eventq.o \
+ lingo/xlibs/f/fadegammadownxcmd.o \
+ lingo/xlibs/f/fadegammaupxcmd.o \
+ lingo/xlibs/f/fadegammaxcmd.o \
+ lingo/xlibs/f/fedracul.o \
+ lingo/xlibs/f/feimasks.o \
+ lingo/xlibs/f/feiprefs.o \
+ lingo/xlibs/f/fileexists.o \
+ lingo/xlibs/f/fileio.o \
+ lingo/xlibs/f/findereventsxcmd.o \
+ lingo/xlibs/f/findfolder.o \
+ lingo/xlibs/f/findsys.o \
+ lingo/xlibs/f/findwin.o \
+ lingo/xlibs/f/flushxobj.o \
+ lingo/xlibs/f/fplayxobj.o \
+ lingo/xlibs/f/fsutil.o \
+ lingo/xlibs/g/genutils.o \
+ lingo/xlibs/g/getscreenrectsxfcn.o \
+ lingo/xlibs/g/getscreensizexfcn.o \
+ lingo/xlibs/g/getsoundinlevel.o \
+ lingo/xlibs/g/gpid.o \
+ lingo/xlibs/h/henry.o \
+ lingo/xlibs/h/hitmap.o \
+ lingo/xlibs/i/inixobj.o \
+ lingo/xlibs/i/instobj.o \
+ lingo/xlibs/i/iscd.o \
+ lingo/xlibs/i/ispippin.o \
+ lingo/xlibs/j/jitdraw3.o \
+ lingo/xlibs/j/jwxini.o \
+ lingo/xlibs/l/labeldrvxobj.o \
+ lingo/xlibs/l/listdev.o \
+ lingo/xlibs/m/maniacbg.o \
+ lingo/xlibs/m/mapnavigatorxobj.o \
+ lingo/xlibs/m/memcheckxobj.o \
+ lingo/xlibs/m/memoryxobj.o \
+ lingo/xlibs/m/misc.o \
+ lingo/xlibs/m/miscx.o \
+ lingo/xlibs/m/mmaskxobj.o \
+ lingo/xlibs/m/mmovie.o \
+ lingo/xlibs/m/moovxobj.o \
+ lingo/xlibs/m/movemousejp.o \
+ lingo/xlibs/m/movemousexobj.o \
+ lingo/xlibs/m/movieidxxobj.o \
+ lingo/xlibs/m/movutils.o \
+ lingo/xlibs/m/msfile.o \
+ lingo/xlibs/m/mystisle.o \
+ lingo/xlibs/o/openbleedwindowxcmd.o \
+ lingo/xlibs/o/orthoplayxobj.o \
+ lingo/xlibs/p/paco.o \
+ lingo/xlibs/p/palxobj.o \
+ lingo/xlibs/p/panel.o \
+ lingo/xlibs/p/pharaohs.o \
+ lingo/xlibs/p/popupmenuxobj.o \
+ lingo/xlibs/p/porta.o \
+ lingo/xlibs/p/prefpath.o \
+ lingo/xlibs/p/printomatic.o \
+ lingo/xlibs/p/processxobj.o \
+ lingo/xlibs/p/putcurs.o \
+ lingo/xlibs/q/qtcatmovieplayerxobj.o \
+ lingo/xlibs/q/qtmovie.o \
+ lingo/xlibs/q/qtvr.o \
+ lingo/xlibs/q/quicktime.o \
+ lingo/xlibs/r/registercomponent.o \
+ lingo/xlibs/r/remixxcmd.o \
+ lingo/xlibs/s/serialportxobj.o \
+ lingo/xlibs/s/smallutil.o \
+ lingo/xlibs/s/soundjam.o \
+ lingo/xlibs/s/spacemgr.o \
+ lingo/xlibs/s/stagetc.o \
+ lingo/xlibs/s/syscolor.o \
+ lingo/xlibs/t/tengu.o \
+ lingo/xlibs/u/unittest.o \
+ lingo/xlibs/v/valkyrie.o \
+ lingo/xlibs/v/versions.o \
+ lingo/xlibs/v/videodiscxobj.o \
+ lingo/xlibs/v/vmisonxfcn.o \
+ lingo/xlibs/v/vmpresent.o \
+ lingo/xlibs/v/volumelist.o \
+ lingo/xlibs/v/voyagerxsound.o \
+ lingo/xlibs/w/widgetxobj.o \
+ lingo/xlibs/w/window.o \
+ lingo/xlibs/w/winxobj.o \
+ lingo/xlibs/w/wininfo.o \
+ lingo/xlibs/x/xcmdglue.o \
+ lingo/xlibs/x/xio.o \
+ lingo/xlibs/x/xplayanim.o \
+ lingo/xlibs/x/xplaypacoxfcn.o \
+ lingo/xlibs/x/xsoundxfcn.o \
+ lingo/xlibs/x/xwin.o \
+ lingo/xlibs/y/yasix.o \
lingo/xtras/directsound.o \
lingo/xtras/filextra.o \
lingo/xtras/keypoll.o \
Commit: 39318d963ebc5cba6a7e2f9ce4357cc3f408242a
https://github.com/scummvm/scummvm/commit/39318d963ebc5cba6a7e2f9ce4357cc3f408242a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-14T00:41:23+02:00
Commit Message:
DEVTOOLS: Adapt Director XObj stub generator to new directory structure
Changed paths:
devtools/director-generate-xobj-stub.py
diff --git a/devtools/director-generate-xobj-stub.py b/devtools/director-generate-xobj-stub.py
index 930e60c6709..3c316aee5eb 100755
--- a/devtools/director-generate-xobj-stub.py
+++ b/devtools/director-generate-xobj-stub.py
@@ -60,8 +60,8 @@ LEGAL = """/* ScummVM - Graphic Adventure Engine
TEMPLATE_H = (
LEGAL
+ """
-#ifndef DIRECTOR_LINGO_{base_upper}_{slug_upper}_H
-#define DIRECTOR_LINGO_{base_upper}_{slug_upper}_H
+#ifndef DIRECTOR_LINGO_{base_upper}_{slug_upper_alpha}_{slug_upper}_H
+#define DIRECTOR_LINGO_{base_upper}_{slug_upper_alpha}_{slug_upper}_H
namespace Director {{
@@ -99,7 +99,7 @@ TEMPLATE = (
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/{base}/{slug}.h"
+#include "director/lingo/{base}/{slug_alpha}/{slug}.h"
/**************************************************
*
@@ -190,8 +190,8 @@ XTRA_PROPS_H = """
XCMD_TEMPLATE_H = (
LEGAL
+ """
-#ifndef DIRECTOR_LINGO_XLIBS_{slug_upper}_H
-#define DIRECTOR_LINGO_XLIBS_{slug_upper}_H
+#ifndef DIRECTOR_LINGO_XLIBS_{slug_upper_alpha}_{slug_upper}_H
+#define DIRECTOR_LINGO_XLIBS_{slug_upper_alpha}_{slug_upper}_H
namespace Director {{
@@ -222,7 +222,7 @@ XCMD_TEMPLATE = (
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-object.h"
#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/{slug}.h"
+#include "director/lingo/xlibs/{slug_alpha}/{slug}.h"
/**************************************************
*
@@ -287,7 +287,8 @@ def read_uint32_be(data: bytes) -> int:
def inject_makefile(slug: str, xcode_type: XCodeType) -> None:
make_contents = open(MAKEFILE_PATH, "r").readlines()
- storage_path = "lingo/xtras" if xcode_type == "Xtra" else "lingo/xlibs"
+ slug_alpha = slug[:1]
+ storage_path = f"lingo/xtras/{slug_alpha}" if xcode_type == "Xtra" else f"lingo/xlibs"
expr = re.compile(f"^\t{storage_path}/([a-zA-Z0-9\\-]+).o( \\\\|)")
for i in range(len(make_contents)):
m = expr.match(make_contents[i])
@@ -313,7 +314,8 @@ def inject_makefile(slug: str, xcode_type: XCodeType) -> None:
def inject_lingo_object(slug: str, xobj_class: str, director_version: int, xcode_type: XCodeType) -> None:
# write include statement for the object header
lo_contents = open(LINGO_OBJECT_PATH, "r").readlines()
- storage_path = "director/lingo/xtras" if xcode_type == "Xtra" else "director/lingo/xlibs"
+ slug_alpha = slug[:1]
+ storage_path = f"director/lingo/xtras/{slug_alpha}" if xcode_type == "Xtra" else f"director/lingo/xlibs"
obj_type = "kXtraObj" if xcode_type == "Xtra" else "kXObj"
expr = re.compile(f'^#include "{storage_path}/([a-zA-Z0-9\\-]+)\\.h"')
in_xlibs = False
@@ -765,6 +767,7 @@ def generate_xobject_stubs(
cpp_text = TEMPLATE.format(
base="xlibs",
slug=slug,
+ slug_alpha=slug[:1],
name=name,
filename=filename,
xmethtable="\n".join(xmethtable),
@@ -803,6 +806,7 @@ def generate_xobject_stubs(
header_text = TEMPLATE_H.format(
base_upper="XLIBS",
slug_upper=slug.upper(),
+ slug_upper_alpha=slug.upper()[:1],
xobject_class=xobject_class,
xobj_class=xobj_class,
xtra_props_h="",
@@ -833,6 +837,7 @@ def generate_xcmd_stubs(
methtype = "CBLTIN" if type == "XCMD" else "HBLTIN"
cpp_text = XCMD_TEMPLATE.format(
slug=slug,
+ slug_alpha=slug[:1],
name=name,
filename=filename,
xobj_class=xobj_class,
@@ -858,6 +863,7 @@ def generate_xcmd_stubs(
header_text = XCMD_TEMPLATE_H.format(
slug_upper=slug.upper(),
+ slug_upper_alpha=slug.upper()[:1],
xobj_class=xobj_class,
methlist=TEMPLATE_HEADER_METH.format(methname=name),
)
@@ -882,6 +888,7 @@ def generate_xtra_stubs(
dry_run: bool = False,
) -> None:
meths = []
+ slug_alpha=slug[:1]
for e in msgtable:
elem = e.split("--", 1)[0].strip()
if not elem:
@@ -923,6 +930,7 @@ def generate_xtra_stubs(
cpp_text = TEMPLATE.format(
base="xtras",
slug=slug,
+ slug_alpha=slug_alpha,
name=name,
filename=filename,
xmethtable="\n".join(msgtable),
@@ -968,12 +976,13 @@ def generate_xtra_stubs(
print(cpp_text)
print()
else:
- with open(os.path.join(LINGO_XTRAS_PATH, f"{slug}.cpp"), "w") as cpp:
+ with open(os.path.join(LINGO_XTRAS_PATH, f"{slug_alpha}/{slug}.cpp"), "w") as cpp:
cpp.write(cpp_text)
header_text = TEMPLATE_H.format(
base_upper="XTRAS",
slug_upper=slug.upper(),
+ slug_upper_alpha=slug.upper()[:1],
xobject_class=xobject_class,
xobj_class=xobj_class,
xtra_props_h=XTRA_PROPS_H,
@@ -984,7 +993,7 @@ def generate_xtra_stubs(
print(header_text)
print()
else:
- with open(os.path.join(LINGO_XTRAS_PATH, f"{slug}.h"), "w") as header:
+ with open(os.path.join(LINGO_XTRAS_PATH, f"{slug_alpha}/{slug}.h"), "w") as header:
header.write(header_text)
if not dry_run:
More information about the Scummvm-git-logs
mailing list