diff --git a/data/common/lib/sort.obj b/data/common/lib/sort.obj
deleted file mode 100644
index 063da99799..0000000000
Binary files a/data/common/lib/sort.obj and /dev/null differ
diff --git a/data/eng/Makefile b/data/eng/Makefile
index 440cfdcd14..ab5347a560 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -181,6 +181,7 @@ FASM_PROGRAMS:=\
  lib/libio.obj:LIB/LIBIO.OBJ:$(PROGS)/develop/libraries/libs-dev/libio/libio.asm \
  lib/msgbox.obj:LIB/MSGBOX.OBJ:$(PROGS)/develop/libraries/msgbox/msgbox.asm \
  lib/network.obj:LIB/NETWORK.OBJ:$(PROGS)/develop/libraries/network/network.asm \
+ lib/sort.obj:LIB/SORT.OBJ:$(PROGS)/develop/libraries/sorter/sort.asm \
  lib/http.obj:LIB/HTTP.OBJ:$(PROGS)/develop/libraries/http/http.asm \
  lib/proc_lib.obj:LIB/PROC_LIB.OBJ:$(PROGS)/develop/libraries/proc_lib/trunk/proc_lib.asm \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ:$(PROGS)/media/zsea/plugins/png/cnv_png.asm \
@@ -323,7 +324,6 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \
  games/kosilka:GAMES/KOSILKA \
  ../common/lib/pixlib.obj:LIB/PIXLIB.OBJ \
- ../common/lib/sort.obj:LIB/SORT.OBJ \
  ../common/lib/iconv.obj:LIB/ICONV.OBJ \
  ../common/lib/netcode.obj:LIB/NETCODE.OBJ \
  media/ac97snd:MEDIA/AC97SND \
diff --git a/data/et/Makefile b/data/et/Makefile
index 552a47e35c..b1851968d4 100644
--- a/data/et/Makefile
+++ b/data/et/Makefile
@@ -181,6 +181,7 @@ FASM_PROGRAMS:=\
  lib/libio.obj:LIB/LIBIO.OBJ:$(PROGS)/develop/libraries/libs-dev/libio/libio.asm \
  lib/msgbox.obj:LIB/MSGBOX.OBJ:$(PROGS)/develop/libraries/msgbox/msgbox.asm \
  lib/network.obj:LIB/NETWORK.OBJ:$(PROGS)/develop/libraries/network/network.asm \
+ lib/sort.obj:LIB/SORT.OBJ:$(PROGS)/develop/libraries/sorter/sort.asm \
  lib/http.obj:LIB/HTTP.OBJ:$(PROGS)/develop/libraries/http/http.asm \
  lib/proc_lib.obj:LIB/PROC_LIB.OBJ:$(PROGS)/develop/libraries/proc_lib/trunk/proc_lib.asm \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ:$(PROGS)/media/zsea/plugins/png/cnv_png.asm \
@@ -323,7 +324,6 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \
  games/kosilka:GAMES/KOSILKA \
  ../common/lib/pixlib.obj:LIB/PIXLIB.OBJ \
- ../common/lib/sort.obj:LIB/SORT.OBJ \
  ../common/lib/iconv.obj:LIB/ICONV.OBJ \
  ../common/lib/netcode.obj:LIB/NETCODE.OBJ \
  media/ac97snd:MEDIA/AC97SND \
diff --git a/data/it/Makefile b/data/it/Makefile
index 8854423775..9afab5f7c8 100644
--- a/data/it/Makefile
+++ b/data/it/Makefile
@@ -181,6 +181,7 @@ FASM_PROGRAMS:=\
  lib/libio.obj:LIB/LIBIO.OBJ:$(PROGS)/develop/libraries/libs-dev/libio/libio.asm \
  lib/msgbox.obj:LIB/MSGBOX.OBJ:$(PROGS)/develop/libraries/msgbox/msgbox.asm \
  lib/network.obj:LIB/NETWORK.OBJ:$(PROGS)/develop/libraries/network/network.asm \
+ lib/sort.obj:LIB/SORT.OBJ:$(PROGS)/develop/libraries/sorter/sort.asm \
  lib/http.obj:LIB/HTTP.OBJ:$(PROGS)/develop/libraries/http/http.asm \
  lib/proc_lib.obj:LIB/PROC_LIB.OBJ:$(PROGS)/develop/libraries/proc_lib/trunk/proc_lib.asm \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ:$(PROGS)/media/zsea/plugins/png/cnv_png.asm \
@@ -322,7 +323,6 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \
  games/kosilka:GAMES/KOSILKA \
  ../common/lib/pixlib.obj:LIB/PIXLIB.OBJ \
- ../common/lib/sort.obj:LIB/SORT.OBJ \
  ../common/lib/iconv.obj:LIB/ICONV.OBJ \
  ../common/lib/netcode.obj:LIB/NETCODE.OBJ \
  media/ac97snd:MEDIA/AC97SND \
diff --git a/data/rus/Makefile b/data/rus/Makefile
index 86aafff1a2..69e3612389 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -181,6 +181,7 @@ FASM_PROGRAMS:=\
  lib/libio.obj:LIB/LIBIO.OBJ:$(PROGS)/develop/libraries/libs-dev/libio/libio.asm \
  lib/msgbox.obj:LIB/MSGBOX.OBJ:$(PROGS)/develop/libraries/msgbox/msgbox.asm \
  lib/network.obj:LIB/NETWORK.OBJ:$(PROGS)/develop/libraries/network/network.asm \
+ lib/sort.obj:LIB/SORT.OBJ:$(PROGS)/develop/libraries/sorter/sort.asm \
  lib/http.obj:LIB/HTTP.OBJ:$(PROGS)/develop/libraries/http/http.asm \
  lib/proc_lib.obj:LIB/PROC_LIB.OBJ:$(PROGS)/develop/libraries/proc_lib/trunk/proc_lib.asm \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ:$(PROGS)/media/zsea/plugins/png/cnv_png.asm \
@@ -318,7 +319,6 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  games/whowtbam:GAMES/WHOWTBAM games/xonix:GAMES/XONIX \
  games/kosilka:GAMES/KOSILKA \
  ../common/lib/pixlib.obj:LIB/PIXLIB.OBJ \
- ../common/lib/sort.obj:LIB/SORT.OBJ \
  ../common/lib/iconv.obj:LIB/ICONV.OBJ \
  ../common/lib/netcode.obj:LIB/NETCODE.OBJ \
  media/ac97snd:MEDIA/AC97SND \
diff --git a/data/sp/Makefile b/data/sp/Makefile
index 00726f7781..0fde642a9d 100644
--- a/data/sp/Makefile
+++ b/data/sp/Makefile
@@ -181,6 +181,7 @@ FASM_PROGRAMS:=\
  lib/libio.obj:LIB/LIBIO.OBJ:$(PROGS)/develop/libraries/libs-dev/libio/libio.asm \
  lib/msgbox.obj:LIB/MSGBOX.OBJ:$(PROGS)/develop/libraries/msgbox/msgbox.asm \
  lib/network.obj:LIB/NETWORK.OBJ:$(PROGS)/develop/libraries/network/network.asm \
+ lib/sort.obj:LIB/SORT.OBJ:$(PROGS)/develop/libraries/sorter/sort.asm \
  lib/http.obj:LIB/HTTP.OBJ:$(PROGS)/develop/libraries/http/http.asm \
  lib/proc_lib.obj:LIB/PROC_LIB.OBJ:$(PROGS)/develop/libraries/proc_lib/trunk/proc_lib.asm \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ:$(PROGS)/media/zsea/plugins/png/cnv_png.asm \
@@ -322,7 +323,6 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \
  games/kosilka:GAMES/KOSILKA \
  ../common/lib/pixlib.obj:LIB/PIXLIB.OBJ \
- ../common/lib/sort.obj:LIB/SORT.OBJ \
  ../common/lib/iconv.obj:LIB/ICONV.OBJ \
  ../common/lib/netcode.obj:LIB/NETCODE.OBJ \
  media/ac97snd:MEDIA/AC97SND \