Move virt fs related files into fs directory.

67 files changed, 204 insertions, 150 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 910817468..ca320b926 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -887,14 +887,14 @@ SET(SRCS
     utils/perfomance.cpp
     utils/perfomance.h
     utils/debugmemoryobject.h
-    utils/virtfsrwops.cpp
-    utils/virtfsrwops.h
-    utils/virtfstools.cpp
-    utils/virtfstools.h
-    utils/virtlist.cpp
-    utils/virtlist.h
-    utils/virtfs.cpp
-    utils/virtfs.h
+    fs/virtfsrwops.cpp
+    fs/virtfsrwops.h
+    fs/virtfstools.cpp
+    fs/virtfstools.h
+    fs/virtlist.cpp
+    fs/virtlist.h
+    fs/virtfs.cpp
+    fs/virtfs.h
     utils/process.cpp
     utils/process.h
     utils/sdl2helper.cpp
@@ -910,10 +910,10 @@ SET(SRCS
     utils/stringvector.h
     utils/timer.cpp
     utils/timer.h
-    utils/virtfile.cpp
-    utils/virtfile.h
-    utils/virtfileprivate.cpp
-    utils/virtfileprivate.h
+    fs/virtfile.cpp
+    fs/virtfile.h
+    fs/virtfileprivate.cpp
+    fs/virtfileprivate.h
     utils/mutex.h
     utils/naclmessages.cpp
     utils/naclmessages.h
@@ -1773,14 +1773,14 @@ SET(DYE_CMD_SRCS
     utils/paths.h
     utils/perfomance.cpp
     utils/perfomance.h
-    utils/virtfsrwops.cpp
-    utils/virtfsrwops.h
-    utils/virtfstools.cpp
-    utils/virtfstools.h
-    utils/virtlist.cpp
-    utils/virtlist.h
-    utils/virtfs.cpp
-    utils/virtfs.h
+    fs/virtfsrwops.cpp
+    fs/virtfsrwops.h
+    fs/virtfstools.cpp
+    fs/virtfstools.h
+    fs/virtlist.cpp
+    fs/virtlist.h
+    fs/virtfs.cpp
+    fs/virtfs.h
     utils/sdl2helper.cpp
     utils/sdl2helper.h
     utils/sdlcheckutils.cpp
@@ -1792,10 +1792,10 @@ SET(DYE_CMD_SRCS
     utils/stringutils.h
     utils/timer.cpp
     utils/timer.h
-    utils/virtfile.cpp
-    utils/virtfile.h
-    utils/virtfileprivate.cpp
-    utils/virtfileprivate.h
+    fs/virtfile.cpp
+    fs/virtfile.h
+    fs/virtfileprivate.cpp
+    fs/virtfileprivate.h
     utils/xml.cpp
     utils/xml.h
     utils/xml.inc
diff --git a/src/Makefile.am b/src/Makefile.am
index ff345a292..6c5b2d4e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -551,14 +551,14 @@ BASE_SRC += events/actionevent.h \
 	      utils/perfomance.cpp \
 	      utils/perfomance.h \
 	      utils/debugmemoryobject.h \
-	      utils/virtfsrwops.cpp \
-	      utils/virtfsrwops.h \
-	      utils/virtfstools.cpp \
-	      utils/virtfstools.h \
-	      utils/virtlist.cpp \
-	      utils/virtlist.h \
-	      utils/virtfs.cpp \
-	      utils/virtfs.h \
+	      fs/virtfsrwops.cpp \
+	      fs/virtfsrwops.h \
+	      fs/virtfstools.cpp \
+	      fs/virtfstools.h \
+	      fs/virtlist.cpp \
+	      fs/virtlist.h \
+	      fs/virtfs.cpp \
+	      fs/virtfs.h \
 	      utils/process.cpp \
 	      utils/process.h \
 	      utils/sdl2helper.cpp \
@@ -576,10 +576,10 @@ BASE_SRC += events/actionevent.h \
 	      utils/stringvector.h \
 	      utils/timer.cpp \
 	      utils/timer.h \
-	      utils/virtfile.cpp \
-	      utils/virtfile.h \
-	      utils/virtfileprivate.cpp \
-	      utils/virtfileprivate.h \
+	      fs/virtfile.cpp \
+	      fs/virtfile.h \
+	      fs/virtfileprivate.cpp \
+	      fs/virtfileprivate.h \
 	      utils/mutex.h \
 	      utils/naclmessages.cpp \
 	      utils/naclmessages.h \
@@ -1919,7 +1919,7 @@ manaplustests_SOURCES = ${SRC} \
 	      enums/enums_unittest.cc \
 	      utils/dumplibs_unittest.cc \
 	      utils/checkutils_unittest.cc \
-	      utils/virtfs_unittest.cc \
+	      fs/virtfs_unittest.cc \
 	      utils/xml_unittest.cc \
 	      utils/timer_unittest.cc \
 	      utils/xmlutils_unittest.cc \
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index b047c62cd..1f6fae035 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -33,8 +33,10 @@
 #endif  // WIN32
 
 #include "configuration.h"
+
+#include "fs/virtfs.h"
+
 #include "utils/mkdir.h"
-#include "utils/virtfs.h"
 
 #include "debug.h"
 
diff --git a/src/client.cpp b/src/client.cpp
index 5aae6960c..e87ac65cb 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -42,11 +42,8 @@
 
 #include "enums/being/attributesstrings.h"
 
-#include "input/inputmanager.h"
-#include "input/joystick.h"
-#include "input/keyboardconfig.h"
-
-#include "input/touch/touchmanager.h"
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
@@ -79,6 +76,12 @@
 #include "gui/widgets/desktop.h"
 #include "gui/widgets/windowcontainer.h"
 
+#include "input/inputmanager.h"
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+
+#include "input/touch/touchmanager.h"
+
 #include "net/charserverhandler.h"
 #include "net/chathandler.h"
 #include "net/download.h"
@@ -143,8 +146,6 @@
 #ifdef ANDROID
 #include "utils/paths.h"
 #endif  // ANDROID
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 7acc8ebf5..95aac7ed1 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -29,11 +29,12 @@
 
 #include "being/beingspeech.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/files.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"
-#include "utils/virtfs.h"
 
 #include "render/renderers.h"
 
diff --git a/src/dirs.cpp b/src/dirs.cpp
index c1cd3ac49..43f27ae4c 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -28,6 +28,8 @@
 #include "main.h"
 #include "settings.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/base64.h"
 #if defined(__native_client__) || (defined(ANDROID) && defined(USE_SDL2))
 #include "utils/files.h"
@@ -36,7 +38,6 @@
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"
-#include "utils/virtfs.h"
 
 #ifdef ANDROID
 #ifdef USE_SDL2
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 3fdae7e14..0ee7d0c2c 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -30,11 +30,8 @@
 #include "settings.h"
 #include "soundmanager.h"
 
-#include "input/inputmanager.h"
-#include "input/joystick.h"
-#include "input/keyboardconfig.h"
-
-#include "input/touch/touchmanager.h"
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
@@ -48,6 +45,12 @@
 #include "gui/widgets/windowcontainer.h"
 #include "gui/widgets/window.h"
 
+#include "input/inputmanager.h"
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+
+#include "input/touch/touchmanager.h"
+
 #include "resources/imagehelper.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
@@ -63,8 +66,6 @@
 #include "utils/paths.h"
 #endif  // ANDROID
 
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index 433233143..e36bf8547 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -24,6 +24,8 @@
 #include "maingui.h"
 #include "sdlshared.h"
 
+#include "fs/virtfs.h"
+
 #include "resources/imagewriter.h"
 
 #include "resources/image/image.h"
@@ -37,7 +39,6 @@
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 
 #include <iostream>
 
diff --git a/src/utils/virtfile.cpp b/src/fs/virtfile.cpp
index b7e6cce1f..9f9ab6e98 100644
--- a/src/utils/virtfile.cpp
+++ b/src/fs/virtfile.cpp
@@ -18,10 +18,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/virtfile.h"
+#include "fs/virtfile.h"
+
+#include "fs/virtfileprivate.h"
 
 #include "utils/delete2.h"
-#include "utils/virtfileprivate.h"
 
 #include "debug.h"
 
diff --git a/src/utils/virtfile.h b/src/fs/virtfile.h
index cf7ded1a4..cf7ded1a4 100644
--- a/src/utils/virtfile.h
+++ b/src/fs/virtfile.h
diff --git a/src/utils/virtfileprivate.cpp b/src/fs/virtfileprivate.cpp
index e1a5885f7..6bd5d3b9a 100644
--- a/src/utils/virtfileprivate.cpp
+++ b/src/fs/virtfileprivate.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/virtfileprivate.h"
+#include "fs/virtfileprivate.h"
 
 #include "debug.h"
 
diff --git a/src/utils/virtfileprivate.h b/src/fs/virtfileprivate.h
index 5b280de78..5b280de78 100644
--- a/src/utils/virtfileprivate.h
+++ b/src/fs/virtfileprivate.h
diff --git a/src/utils/virtfs.cpp b/src/fs/virtfs.cpp
index cf1d353b6..0db25f435 100644
--- a/src/utils/virtfs.cpp
+++ b/src/fs/virtfs.cpp
@@ -18,12 +18,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/virtfs.h"
+#include "fs/virtfs.h"
+
+#include "fs/virtfile.h"
+#include "fs/virtfileprivate.h"
+#include "fs/virtlist.h"
 
 #include "utils/checkutils.h"
-#include "utils/virtfile.h"
-#include "utils/virtfileprivate.h"
-#include "utils/virtlist.h"
 
 #include <iostream>
 #include <unistd.h>
diff --git a/src/utils/virtfs.h b/src/fs/virtfs.h
index e0f188cfb..e0f188cfb 100644
--- a/src/utils/virtfs.h
+++ b/src/fs/virtfs.h
diff --git a/src/utils/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc
index e8af0bb1d..4f3a74a7b 100644
--- a/src/utils/virtfs_unittest.cc
+++ b/src/fs/virtfs_unittest.cc
@@ -20,11 +20,12 @@
 
 #include "catch.hpp"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+#include "fs/virtlist.h"
+
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
 
 #include "debug.h"
 
diff --git a/src/utils/virtfsrwops.cpp b/src/fs/virtfsrwops.cpp
index 837704465..036d8bb60 100644
--- a/src/utils/virtfsrwops.cpp
+++ b/src/fs/virtfsrwops.cpp
@@ -42,10 +42,12 @@
  *  Copyright (C) 2012-2017  The ManaPlus Developers
  */
 
-#include "utils/virtfsrwops.h"
+#include "fs/virtfsrwops.h"
 
 #include "logger.h"
 
+#include "fs/virtfs.h"
+
 #ifdef DEBUG_VIRTFS
 #include "utils/debugmemoryobject.h"
 
@@ -53,7 +55,6 @@
 #endif  // DEBUG_VIRTFS
 
 #include "utils/fuzzer.h"
-#include "utils/virtfs.h"
 
 #include "debug.h"
 
diff --git a/src/utils/virtfsrwops.h b/src/fs/virtfsrwops.h
index 82bb740de..82bb740de 100644
--- a/src/utils/virtfsrwops.h
+++ b/src/fs/virtfsrwops.h
diff --git a/src/utils/virtfstools.cpp b/src/fs/virtfstools.cpp
index adc1c9772..4d6c96c33 100644
--- a/src/utils/virtfstools.cpp
+++ b/src/fs/virtfstools.cpp
@@ -18,14 +18,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/virtfstools.h"
+#include "fs/virtfstools.h"
 
 #include "logger.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtlist.h"
+
 #include "utils/paths.h"
 #include "utils/stringutils.h"
-#include "utils/virtfs.h"
-#include "utils/virtlist.h"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/utils/virtfstools.h b/src/fs/virtfstools.h
index 4f2a77f4c..4f2a77f4c 100644
--- a/src/utils/virtfstools.h
+++ b/src/fs/virtfstools.h
diff --git a/src/utils/virtlist.cpp b/src/fs/virtlist.cpp
index 932afc4df..d561e6b66 100644
--- a/src/utils/virtlist.cpp
+++ b/src/fs/virtlist.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/virtlist.h"
+#include "fs/virtlist.h"
 
 #include "debug.h"
 
diff --git a/src/utils/virtlist.h b/src/fs/virtlist.h
index 5b1d10924..5b1d10924 100644
--- a/src/utils/virtlist.h
+++ b/src/fs/virtlist.h
diff --git a/src/game.cpp b/src/game.cpp
index 4d4ece3fe..3318c4268 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -41,13 +41,7 @@
 
 #include "enums/being/beingdirection.h"
 
-#include "particle/particleengine.h"
-
-#include "input/inputmanager.h"
-#include "input/joystick.h"
-#include "input/keyboardconfig.h"
-
-#include "input/touch/touchmanager.h"
+#include "fs/virtfs.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
@@ -100,11 +94,19 @@
 #include "gui/widgets/tabs/chat/langtab.h"
 #include "gui/widgets/tabs/chat/tradetab.h"
 
+#include "input/inputmanager.h"
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+
+#include "input/touch/touchmanager.h"
+
 #include "net/generalhandler.h"
 #include "net/gamehandler.h"
 #include "net/packetcounters.h"
 #include "net/serverfeatures.h"
 
+#include "particle/particleengine.h"
+
 #include "resources/delayedmanager.h"
 #include "resources/imagewriter.h"
 #include "resources/mapreader.h"
@@ -121,7 +123,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
-#include "utils/virtfs.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 61bb93453..877f112e0 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -66,6 +66,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "fs/virtfstools.h"
+
 #include "gui/fonts/textchunk.h"
 
 #include "render/graphics.h"
@@ -79,7 +81,6 @@
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
-#include "utils/virtfstools.h"
 
 #include "debug.h"
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 1888627d1..206d8f9a5 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -29,6 +29,10 @@
 
 #include "const/gui/theme.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+#include "fs/virtlist.h"
+
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
@@ -45,9 +49,6 @@
 #include "resources/loaders/xmlloader.h"
 
 #include "utils/dtor.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 68a38300d..4e2244a2f 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -24,6 +24,8 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -31,7 +33,6 @@
 #include "gui/widgets/browserbox.h"
 
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "render/sdlgraphics.h"
 
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 28a57e7e0..ce0b0132d 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -29,6 +29,8 @@
 #include "settings.h"
 #include "spellmanager.h"
 
+#include "fs/virtfstools.h"
+
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
@@ -59,7 +61,6 @@
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/sdlhelper.h"
-#include "utils/virtfstools.h"
 #ifdef __native_client__
 #include "utils/naclmessages.h"
 #endif  // __native_client__
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 68fc3852b..902068376 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -29,6 +29,8 @@
 
 #include "const/resources/currency.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/mailmessage.h"
 #include "gui/userpalette.h"
@@ -117,7 +119,6 @@
 #include "utils/delete2.h"
 #include "utils/env.h"
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 
 #include "utils/translation/translationmanager.h"
 
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 094faea6d..40016d4f0 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -35,6 +35,8 @@
 
 #include "const/gui/chat.h"
 
+#include "fs/virtfstools.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/focushandler.h"
@@ -71,7 +73,6 @@
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
-#include "utils/virtfstools.h"
 
 #include <sys/stat.h>
 
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index e1ba2de30..91bdbe13e 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -26,7 +26,7 @@
 
 #include "enums/gui/layouttype.h"
 
-#include "input/inputmanager.h"
+#include "fs/virtfstools.h"
 
 #include "gui/gui.h"
 
@@ -37,10 +37,11 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "input/inputmanager.h"
+
 #include "utils/gettext.h"
 #include "utils/paths.h"
 #include "utils/process.h"
-#include "utils/virtfstools.h"
 
 #include "utils/translation/podict.h"
 #include "utils/translation/translationmanager.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index f19fb2239..e261dead7 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -31,6 +31,8 @@
 
 #include "enums/resources/map/blockmask.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/popupmanager.h"
 #include "gui/viewport.h"
 #include "gui/userpalette.h"
@@ -50,7 +52,6 @@
 #include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index ddb265bc7..4d0ff9f3a 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -29,6 +29,9 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
@@ -45,8 +48,6 @@
 
 #include "utils/delete2.h"
 #include "utils/files.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"
diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc
index 158ce51fc..b7b97321a 100644
--- a/src/integrity_unittest.cc
+++ b/src/integrity_unittest.cc
@@ -25,6 +25,10 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+#include "fs/virtfstools.h"
+
 #include "input/inputactionmap.h"
 
 #include "resources/image/image.h"
@@ -40,9 +44,6 @@
 
 #include "utils/env.h"
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
-#include "utils/virtfstools.h"
 
 #include <physfs.h>
 #include <SDL_image.h>
diff --git a/src/maingui.cpp b/src/maingui.cpp
index c94c456a5..7bf5e1290 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -26,13 +26,14 @@
 #include "commandline.h"
 #include "settings.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+
 #include "utils/delete2.h"
 #ifdef ANDROID
 #include "utils/mkdir.h"
 #include "utils/paths.h"
 #endif  // ANDROID
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
 #include "utils/process.h"
 #include "utils/xml.h"
 
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index d4854cfe2..f8a5b608c 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -25,7 +25,7 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "utils/virtfstools.h"
+#include "fs/virtfstools.h"
 
 #include "render/opengl/mgl.h"
 #ifdef __native_client__
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index ef06c9527..f724618b5 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -28,9 +28,10 @@
 #include "logger.h"
 #endif  // DEBUG_IMAGES
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+
 #include "utils/mathutils.h"
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
 #include "utils/sdlcheckutils.h"
 
 #include "resources/openglimagehelper.h"
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index 769ac238c..901b5e65e 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -21,7 +21,8 @@
 #ifndef RESOURCES_BEINGCOMMON_H
 #define RESOURCES_BEINGCOMMON_H
 
-#include "utils/virtfstools.h"
+#include "fs/virtfstools.h"
+
 #include "utils/xml.h"
 
 #include "localconsts.h"
diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp
index 031d78945..59080efe6 100644
--- a/src/resources/db/badgesdb.cpp
+++ b/src/resources/db/badgesdb.cpp
@@ -22,7 +22,8 @@
 
 #include "configuration.h"
 
-#include "utils/virtfstools.h"
+#include "fs/virtfstools.h"
+
 #include "utils/xmlutils.h"
 
 #include "debug.h"
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 9ff9d78c6..06ce15542 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -28,6 +28,8 @@
 
 #include "enums/resources/spritedirection.h"
 
+#include "fs/virtfstools.h"
+
 #include "resources/iteminfo.h"
 #include "resources/itemtypemapdata.h"
 
@@ -43,7 +45,6 @@
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/stringmap.h"
-#include "utils/virtfstools.h"
 
 #include "debug.h"
 
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index 4c9c4cd76..a17403769 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -22,8 +22,9 @@
 
 #include "configuration.h"
 
+#include "fs/virtfstools.h"
+
 #include "utils/checkutils.h"
-#include "utils/virtfstools.h"
 
 #include "resources/dye/dyecolor.h"
 
diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index 5f38aa77a..d562118b3 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -26,6 +26,8 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "resources/sdlimagehelper.h"
 #ifdef USE_SDL2
 #include "resources/surfaceimagehelper.h"
@@ -42,7 +44,6 @@
 
 #include "utils/delete2.h"
 #include "utils/env.h"
-#include "utils/virtfs.h"
 
 #ifndef USE_SDL2
 #include <SDL.h>
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 9431f0d72..285ac22a8 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -26,6 +26,8 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/theme.h"
 
@@ -41,7 +43,6 @@
 
 #include "utils/delete2.h"
 #include "utils/env.h"
-#include "utils/virtfs.h"
 
 #ifndef USE_SDL2
 #include <SDL.h>
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index b4826238a..3a4909d94 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -22,6 +22,9 @@
 
 #include "resources/imagehelper.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+
 #include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
@@ -31,8 +34,6 @@
 #include "resources/dye/dye.h"
 
 #include "utils/checkutils.h"
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
 
 #include "debug.h"
 
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index 62fde088b..ee464ae48 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -22,13 +22,14 @@
 
 #include "resources/sdlmusic.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+
 #include "resources/loaders/musicloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/checkutils.h"
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
 
 #include "debug.h"
 
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index 35a938f76..cbc0cbde9 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -22,13 +22,14 @@
 
 #include "resources/soundeffect.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfsrwops.h"
+
 #include "resources/loaders/soundloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/checkutils.h"
-#include "utils/virtfs.h"
-#include "utils/virtfsrwops.h"
 
 #include "debug.h"
 
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index afc2bbffd..5af4e72f3 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -27,14 +27,6 @@
 #include "notifymanager.h"
 #include "settings.h"
 
-#include "resources/map/mapheights.h"
-#include "resources/map/maplayer.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/objectslayer.h"
-#include "resources/map/speciallayer.h"
-#include "resources/map/tileset.h"
-#include "resources/map/walklayer.h"
-
 #include "being/localplayer.h"
 
 #include "enums/resources/notifytypes.h"
@@ -42,6 +34,8 @@
 #include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/userpalette.h"
 
 #include "particle/particle.h"
@@ -53,8 +47,16 @@
 #include "resources/loaders/imageloader.h"
 
 #include "resources/map/location.h"
+#include "resources/map/mapheights.h"
 #include "resources/map/mapobjectlist.h"
+#include "resources/map/maplayer.h"
+#include "resources/map/mapitem.h"
+#include "resources/map/objectslayer.h"
+#include "resources/map/speciallayer.h"
 #include "resources/map/tileanimation.h"
+#include "resources/map/tileset.h"
+#include "resources/map/walklayer.h"
+
 
 #ifdef USE_OPENGL
 #include "render/renderers.h"
@@ -63,7 +65,6 @@
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/mkdir.h"
-#include "utils/virtfs.h"
 #include "utils/timer.h"
 
 #include <queue>
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index f2efd49a6..34a0f128b 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -26,10 +26,11 @@
 #include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/theme.h"
 
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "render/mockgraphics.h"
 
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index 70f3d07e1..cf6c17120 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -28,8 +28,9 @@
 
 #include "enums/resources/map/mapitemtype.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "resources/sdlimagehelper.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 35081c7ba..bf0b95f71 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -33,6 +33,8 @@
 #include "enums/resources/map/collisiontype.h"
 #include "enums/resources/map/mapitemtype.h"
 
+#include "fs/virtfs.h"
+
 #include "resources/map/map.h"
 #include "resources/map/mapheights.h"
 #include "resources/map/maplayer.h"
@@ -58,7 +60,6 @@
 #include "utils/base64.h"
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 #include "utils/stringmap.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc
index 56f055b86..6613a42c1 100644
--- a/src/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/resources/resourcemanager/resourcemanager_unittest.cc
@@ -25,13 +25,14 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "resources/sdlimagehelper.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/env.h"
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include <unistd.h>
 
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index 8eeb2178d..8d31125f5 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -28,6 +28,8 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/theme.h"
 
@@ -42,7 +44,6 @@
 #include "utils/env.h"
 #include "utils/delete2.h"
 #include "utils/mrand.h"
-#include "utils/virtfs.h"
 
 #ifndef USE_SDL2
 #include <SDL.h>
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 397f29af5..413f733be 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -24,10 +24,10 @@
 
 #include "configuration.h"
 
-#include "resources/wallpaperdata.h"
+#include "fs/virtfs.h"
+#include "fs/virtlist.h"
 
-#include "utils/virtfs.h"
-#include "utils/virtlist.h"
+#include "resources/wallpaperdata.h"
 
 #include <algorithm>
 
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 940c51451..5342f82d1 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -28,6 +28,8 @@
 #include "being/localplayer.h"
 #endif  // DYECMD
 
+#include "fs/virtfs.h"
+
 #include "resources/sdlmusic.h"
 #include "resources/soundeffect.h"
 
@@ -35,7 +37,6 @@
 #include "resources/loaders/soundloader.h"
 
 #include "utils/checkutils.h"
-#include "utils/virtfs.h"
 
 #include <SDL.h>
 
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index ac872fa54..7e3586d44 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -26,13 +26,13 @@
 #include "settings.h"
 #include "soundmanager.h"
 
+#include "fs/virtfsrwops.h"
+
 #include "gui/skin.h"
 #include "gui/theme.h"
 
 #include "gui/fonts/font.h"
 
-#include "utils/virtfsrwops.h"
-
 #include "render/graphics.h"
 
 #include "render/vertexes/imagecollection.h"
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index 56d37e7a6..fc9677c30 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -27,12 +27,13 @@
 
 #include "being/localplayer.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/theme.h"
 
 #include "utils/chatutils.h"
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "render/sdlgraphics.h"
 
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index da7270364..4dd26126a 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -28,10 +28,11 @@
 
 #include "utils/mkdir.h"
 #if defined(ANDROID) || defined(__native_client__)
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+#include "fs/virtlist.h"
+
 #include "utils/paths.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
 #endif  // defined(ANDROID) || defined(__native_client__)
 
 #include <dirent.h>
diff --git a/src/utils/files_unittest.cc b/src/utils/files_unittest.cc
index 78be3d924..1012221f2 100644
--- a/src/utils/files_unittest.cc
+++ b/src/utils/files_unittest.cc
@@ -23,9 +23,10 @@
 #include "catch.hpp"
 #include "logger.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 5b1999925..e95f26289 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -28,7 +28,7 @@
 #include "client.h"
 #include "logger.h"
 
-#include "utils/virtfs.h"
+#include "fs/virtfs.h"
 
 #include <libintl.h>
 
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index 43fff958e..3e5bf8829 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -24,9 +24,10 @@
 #include "config.h"
 #endif  // _MSC_VER
 
+#include "fs/virtfs.h"
+
 #include "utils/paths.h"
 
-#include "utils/virtfs.h"
 #include "utils/stringutils.h"
 
 #ifdef USE_X11
diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc
index 1356e214b..60588571a 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/utils/stringutils_unittest.cc
@@ -24,9 +24,10 @@
 
 #include "const/utils/utf8.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/delete2.h"
 #include "utils/dtor.h"
-#include "utils/virtfs.h"
 
 #include "resources/iteminfo.h"
 
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 1bd051b48..3d112f22d 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -20,8 +20,9 @@
 
 #include "utils/translation/poparser.h"
 
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index 73ef6d396..f8f536f88 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -24,12 +24,13 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/theme.h"
 
 #include "utils/delete2.h"
 #include "utils/env.h"
-#include "utils/virtfs.h"
 
 #include "utils/translation/podict.h"
 #include "utils/translation/poparser.h"
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 199acc844..14751d01c 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -20,8 +20,9 @@
 
 #include "utils/translation/translationmanager.h"
 
+#include "fs/virtfstools.h"
+
 #include "utils/delete2.h"
-#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index b85e456f4..8b5b34efc 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -24,9 +24,10 @@
 
 #include "utils/xml/libxml.h"
 
+#include "fs/virtfstools.h"
+
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
-#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 955b170f6..47d6b25de 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -24,10 +24,11 @@
 
 #include "utils/xml/pugixml.h"
 
+#include "fs/virtfstools.h"
+
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
-#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/xml/pugixmlwriter.cpp b/src/utils/xml/pugixmlwriter.cpp
index 1681cdfab..2e61800be 100644
--- a/src/utils/xml/pugixmlwriter.cpp
+++ b/src/utils/xml/pugixmlwriter.cpp
@@ -24,9 +24,10 @@
 
 #include "logger.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
-#include "utils/virtfs.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 3076e9f0b..795cd2fa0 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -24,12 +24,13 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/theme.h"
 
 #include "utils/delete2.h"
 #include "utils/env.h"
-#include "utils/virtfs.h"
 #ifdef ENABLE_PUGIXML
 #include "utils/xmlwriter.h"
 #endif  // ENABLE_PUGIXML
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
index e2bcfb546..b3b9cba81 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/utils/xmlutils_unittest.cc
@@ -26,8 +26,9 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "render/sdlgraphics.h"