diff --git a/src/OSspecific/POSIX/Make/files b/src/OSspecific/POSIX/Make/files
index ce684dc46bc76fa65a43b70edde5e17cb7b293b7..b3cbbb36b98ce6e94a179e13636aed39426aed4a 100644
--- a/src/OSspecific/POSIX/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@@ -1,3 +1,5 @@
+POSIX.C
+
 cpuInfo/cpuInfo.C
 cpuTime/cpuTimePosix.C
 memInfo/memInfo.C
@@ -10,20 +12,19 @@ signals/sigStopAtWriteNow.C
 signals/sigWriteNow.C
 signals/timer.C
 
-regExpPosix.C
-fileStat.C
-POSIX.C
+regExp/regExpPosix.C
+fileStat/fileStat.C
 
 /*
- * Note: fileMonitor assumes inotify by default. Compile with -DFOAM_USE_STAT
- * to use stat (=timestamps) instead of inotify
+ * fileMonitor assumes inotify by default.
+ * Compile with -UFOAM_USE_INOTIFY to use stat (timestamps) instead
  */
-fileMonitor.C
+fileMonitor/fileMonitor.C
 
 #ifdef __sun__
-dummyPrintStack.C
+printStack/dummyPrintStack.C
 #else
-printStack.C
+printStack/printStack.C
 #endif
 
 LIB = $(FOAM_LIBBIN)/libOSspecific
diff --git a/src/OSspecific/POSIX/cpuTime.H b/src/OSspecific/POSIX/cpuTime/cpuTime.H
similarity index 100%
rename from src/OSspecific/POSIX/cpuTime.H
rename to src/OSspecific/POSIX/cpuTime/cpuTime.H
diff --git a/src/OSspecific/POSIX/cpuTimeFwd.H b/src/OSspecific/POSIX/cpuTime/cpuTimeFwd.H
similarity index 100%
rename from src/OSspecific/POSIX/cpuTimeFwd.H
rename to src/OSspecific/POSIX/cpuTime/cpuTimeFwd.H
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
similarity index 100%
rename from src/OSspecific/POSIX/fileMonitor.C
rename to src/OSspecific/POSIX/fileMonitor/fileMonitor.C
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor/fileMonitor.H
similarity index 100%
rename from src/OSspecific/POSIX/fileMonitor.H
rename to src/OSspecific/POSIX/fileMonitor/fileMonitor.H
diff --git a/src/OSspecific/POSIX/fileStat.C b/src/OSspecific/POSIX/fileStat/fileStat.C
similarity index 100%
rename from src/OSspecific/POSIX/fileStat.C
rename to src/OSspecific/POSIX/fileStat/fileStat.C
diff --git a/src/OSspecific/POSIX/fileStat.H b/src/OSspecific/POSIX/fileStat/fileStat.H
similarity index 100%
rename from src/OSspecific/POSIX/fileStat.H
rename to src/OSspecific/POSIX/fileStat/fileStat.H
diff --git a/src/OSspecific/POSIX/dummyPrintStack.C b/src/OSspecific/POSIX/printStack/dummyPrintStack.C
similarity index 100%
rename from src/OSspecific/POSIX/dummyPrintStack.C
rename to src/OSspecific/POSIX/printStack/dummyPrintStack.C
diff --git a/src/OSspecific/POSIX/printStack.C b/src/OSspecific/POSIX/printStack/printStack.C
similarity index 100%
rename from src/OSspecific/POSIX/printStack.C
rename to src/OSspecific/POSIX/printStack/printStack.C
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp/regExp.H
similarity index 100%
rename from src/OSspecific/POSIX/regExp.H
rename to src/OSspecific/POSIX/regExp/regExp.H
diff --git a/src/OSspecific/POSIX/regExpFwd.H b/src/OSspecific/POSIX/regExp/regExpFwd.H
similarity index 100%
rename from src/OSspecific/POSIX/regExpFwd.H
rename to src/OSspecific/POSIX/regExp/regExpFwd.H
diff --git a/src/OSspecific/POSIX/regExpPosix.C b/src/OSspecific/POSIX/regExp/regExpPosix.C
similarity index 100%
rename from src/OSspecific/POSIX/regExpPosix.C
rename to src/OSspecific/POSIX/regExp/regExpPosix.C
diff --git a/src/OSspecific/POSIX/regExpPosix.H b/src/OSspecific/POSIX/regExp/regExpPosix.H
similarity index 100%
rename from src/OSspecific/POSIX/regExpPosix.H
rename to src/OSspecific/POSIX/regExp/regExpPosix.H
diff --git a/src/OSspecific/POSIX/regExpPosixI.H b/src/OSspecific/POSIX/regExp/regExpPosixI.H
similarity index 100%
rename from src/OSspecific/POSIX/regExpPosixI.H
rename to src/OSspecific/POSIX/regExp/regExpPosixI.H