diff --git a/Makefile.rules b/Makefile.rules
index ed948d8aac..5193eb5526 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -57,7 +57,7 @@ SOURCES += src/interpreter/hookintrprtr.c
 SOURCES += src/general/intfuncs.c
 SOURCES += src/interpreter/intrprtr.c
 SOURCES += src/general/iostream.c
-SOURCES += src/listfunc.c
+SOURCES += src/applications/listfunc.c
 SOURCES += src/math/listoper.c
 SOURCES += src/core/lists.c
 SOURCES += src/tnums/macfloat.c
diff --git a/src/applications/README.md b/src/applications/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/listfunc.c b/src/applications/listfunc.c
similarity index 99%
rename from src/listfunc.c
rename to src/applications/listfunc.c
index d4eb75e032..5f5c1188cc 100644
--- a/src/listfunc.c
+++ b/src/applications/listfunc.c
@@ -39,7 +39,7 @@
 #include <src/tnums/trans.h>                  /* transformations */
 #include <src/tnums/pperm.h>                  /* partial perms */
 
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/set.h>                    /* plain sets */
@@ -640,7 +640,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
   if(IS_PLIST(list)) \
     RESET_FILT_LIST(list, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 #define SORT_FUNC_NAME SortDensePlist
 #define SORT_FUNC_ARGS Obj list
@@ -655,7 +655,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
 #define SORT_FILTER_CHECKS() \
   RESET_FILT_LIST(list, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 /****************************************************************************
 **
@@ -678,7 +678,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
   RESET_FILT_LIST(list, FN_IS_SSORT); \
   RESET_FILT_LIST(list, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 #define SORT_FUNC_NAME SortDensePlistComp
 #define SORT_FUNC_ARGS Obj list, Obj func
@@ -695,7 +695,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
   RESET_FILT_LIST(list, FN_IS_SSORT); \
   RESET_FILT_LIST(list, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 /****************************************************************************
 **
@@ -750,7 +750,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
   RESET_FILT_LIST(shadow, FN_IS_SSORT); \
   RESET_FILT_LIST(shadow, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 #define SORT_FUNC_NAME SortParaDensePlist
 #define SORT_FUNC_ARGS Obj list, Obj shadow
@@ -773,7 +773,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
   RESET_FILT_LIST(shadow, FN_IS_SSORT); \
   RESET_FILT_LIST(shadow, FN_IS_NSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 #define SORT_FUNC_NAME SORT_PARA_LISTComp
 #define SORT_FUNC_ARGS Obj list, Obj shadow, Obj func
@@ -794,7 +794,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
     RESET_FILT_LIST(shadow, FN_IS_NSORT); \
     RESET_FILT_LIST(shadow, FN_IS_SSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
   
 #define SORT_FUNC_NAME SortParaDensePlistComp
 #define SORT_FUNC_ARGS Obj list, Obj shadow, Obj func
@@ -817,7 +817,7 @@ Obj             FuncPOSITION_FIRST_COMPONENT_SORTED (
     RESET_FILT_LIST(shadow, FN_IS_NSORT); \
     RESET_FILT_LIST(shadow, FN_IS_SSORT);
 
-#include <src/sortbase.h>
+#include <src/applications/sortbase.h>
 
 
 
diff --git a/src/listfunc.h b/src/applications/listfunc.h
similarity index 100%
rename from src/listfunc.h
rename to src/applications/listfunc.h
diff --git a/src/sortbase.h b/src/applications/sortbase.h
similarity index 100%
rename from src/sortbase.h
rename to src/applications/sortbase.h
diff --git a/src/compiled.h b/src/compiled.h
index 3d914a4bf1..5921ca6803 100644
--- a/src/compiled.h
+++ b/src/compiled.h
@@ -46,7 +46,7 @@ extern "C" {
 
 #include <src/core/lists.h>                  /* generic lists */
 #include <src/math/listoper.h>               /* operations for generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/set.h>                    /* plain sets */
 #include <src/math/vector.h>                 /* functions for plain vectors */
diff --git a/src/core/opers.c b/src/core/opers.c
index 5b22e9f8cd..d2e69dbf7d 100644
--- a/src/core/opers.c
+++ b/src/core/opers.c
@@ -45,7 +45,7 @@
 
 #include <src/core/saveload.h>               /* saving and loading */
 
-#include <src/listfunc.h>   
+#include <src/applications/listfunc.h>   
 #include <src/tnums/gmpints.h>   
 
 #ifdef HPCGAP
diff --git a/src/core/set.c b/src/core/set.c
index 6432bf913e..bc987559be 100644
--- a/src/core/set.c
+++ b/src/core/set.c
@@ -42,7 +42,7 @@
 #include <src/tnums/precord.h>                /* plain records */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/set.h>                    /* plain sets */
 
diff --git a/src/gap.c b/src/gap.c
index cef2ffbc34..e7f29528d3 100644
--- a/src/gap.c
+++ b/src/gap.c
@@ -51,7 +51,7 @@
 
 #include <src/core/lists.h>                  /* generic lists */
 #include <src/math/listoper.h>               /* operations for generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/set.h>                    /* plain sets */
 #include <src/math/vector.h>                 /* functions for plain vectors */
diff --git a/src/general/iostream.c b/src/general/iostream.c
index 435a1869b7..60dfc6574e 100644
--- a/src/general/iostream.c
+++ b/src/general/iostream.c
@@ -34,7 +34,7 @@
 #include <src/core/gvars.h>                  /* global variables */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/tnums/stringobj.h>              /* strings */
diff --git a/src/hpc/aobjects.c b/src/hpc/aobjects.c
index ed9916e01d..a02fd04300 100644
--- a/src/hpc/aobjects.c
+++ b/src/hpc/aobjects.c
@@ -36,7 +36,7 @@
 
 #include <src/core/lists.h>                  /* generic lists */
 #include <src/math/listoper.h>               /* operations for generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 
 
diff --git a/src/hpc/threadapi.c b/src/hpc/threadapi.c
index d91f8ceb5e..a97101b33e 100644
--- a/src/hpc/threadapi.c
+++ b/src/hpc/threadapi.c
@@ -42,7 +42,7 @@
 
 #include <src/core/lists.h>                  /* generic lists */
 #include <src/math/listoper.h>               /* operations for generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/set.h>                    /* set */
 #include <src/tnums/stringobj.h>              /* strings */
diff --git a/src/math/dt.c b/src/math/dt.c
index 05b045e5ab..193119253e 100644
--- a/src/math/dt.c
+++ b/src/math/dt.c
@@ -70,7 +70,7 @@
 #include <src/tnums/precord.h>                /* plain records */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 
 
diff --git a/src/math/dteval.c b/src/math/dteval.c
index 27fbf2d3df..fd633c2dda 100644
--- a/src/math/dteval.c
+++ b/src/math/dteval.c
@@ -47,7 +47,7 @@
 #include <src/tnums/precord.h>                /* plain records */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 
 #include <src/hpc/guards.h>
diff --git a/src/math/listoper.c b/src/math/listoper.c
index 7a3f9eaa5c..b1506df9a0 100644
--- a/src/math/listoper.c
+++ b/src/math/listoper.c
@@ -36,7 +36,7 @@
 
 #include <src/core/lists.h>                  /* generic lists */
 #include <src/math/listoper.h>               /* operations for generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/core/opers.h>                  /* TRY_NEXT_METHOD */
 #include <src/tnums/range.h>                  /* Ranges */
diff --git a/src/sysfiles.c b/src/sysfiles.c
index b0800d9df0..a11d79a2cc 100644
--- a/src/sysfiles.c
+++ b/src/sysfiles.c
@@ -31,7 +31,7 @@
 #include <src/core/calls.h>                  /* generic call mechanism */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for generic lists */
+#include <src/applications/listfunc.h>               /* functions for generic lists */
 
 #include <src/tnums/plist.h>                  /* plain lists */
 #include <src/tnums/stringobj.h>              /* strings */
diff --git a/src/tnums/trans.c b/src/tnums/trans.c
index 65c808db31..aea215bbc9 100644
--- a/src/tnums/trans.c
+++ b/src/tnums/trans.c
@@ -67,7 +67,7 @@
 #include <src/tnums/precord.h>                /* plain records */
 
 #include <src/core/lists.h>                  /* generic lists */
-#include <src/listfunc.h>               /* functions for lists */
+#include <src/applications/listfunc.h>               /* functions for lists */
 #include <src/tnums/plist.h>                  /* plain lists */
 
 #include <src/core/saveload.h>               /* saving and loading */