diff --git a/data/language.Ar b/Assets/language.Ar
similarity index 100%
rename from data/language.Ar
rename to Assets/language.Ar
diff --git a/data/language.Br b/Assets/language.Br
similarity index 100%
rename from data/language.Br
rename to Assets/language.Br
diff --git a/data/language.Cn b/Assets/language.Cn
similarity index 100%
rename from data/language.Cn
rename to Assets/language.Cn
diff --git a/data/language.De b/Assets/language.De
similarity index 100%
rename from data/language.De
rename to Assets/language.De
diff --git a/data/language.Du b/Assets/language.Du
similarity index 100%
rename from data/language.Du
rename to Assets/language.Du
diff --git a/data/language.En b/Assets/language.En
similarity index 100%
rename from data/language.En
rename to Assets/language.En
diff --git a/data/language.Eo b/Assets/language.Eo
similarity index 100%
rename from data/language.Eo
rename to Assets/language.Eo
diff --git a/data/language.Es b/Assets/language.Es
similarity index 100%
rename from data/language.Es
rename to Assets/language.Es
diff --git a/data/language.Fr b/Assets/language.Fr
similarity index 100%
rename from data/language.Fr
rename to Assets/language.Fr
diff --git a/data/language.Hu b/Assets/language.Hu
similarity index 100%
rename from data/language.Hu
rename to Assets/language.Hu
diff --git a/data/language.It b/Assets/language.It
similarity index 100%
rename from data/language.It
rename to Assets/language.It
diff --git a/data/language.Jp b/Assets/language.Jp
similarity index 100%
rename from data/language.Jp
rename to Assets/language.Jp
diff --git a/data/language.Ko b/Assets/language.Ko
similarity index 100%
rename from data/language.Ko
rename to Assets/language.Ko
diff --git a/data/language.Pl b/Assets/language.Pl
similarity index 100%
rename from data/language.Pl
rename to Assets/language.Pl
diff --git a/data/language.Po b/Assets/language.Po
similarity index 100%
rename from data/language.Po
rename to Assets/language.Po
diff --git a/data/language.Ru b/Assets/language.Ru
similarity index 100%
rename from data/language.Ru
rename to Assets/language.Ru
diff --git a/data/language.Se b/Assets/language.Se
similarity index 100%
rename from data/language.Se
rename to Assets/language.Se
diff --git a/data/language.Sl b/Assets/language.Sl
similarity index 100%
rename from data/language.Sl
rename to Assets/language.Sl
diff --git a/data/language.Tu b/Assets/language.Tu
similarity index 100%
rename from data/language.Tu
rename to Assets/language.Tu
diff --git a/data/language.dat b/Assets/language.dat
similarity index 100%
rename from data/language.dat
rename to Assets/language.dat
diff --git a/data/levels.dat b/Assets/levels.dat
similarity index 100%
rename from data/levels.dat
rename to Assets/levels.dat
diff --git a/data/sprites.dat b/Assets/sprites.dat
similarity index 100%
rename from data/sprites.dat
rename to Assets/sprites.dat
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd58d6..d4a1975 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,17 +98,19 @@ install(TARGETS ${LIRI_EXECUTABLE_NAME}
 
 install(FILES io.github.petitlapin.Li-ri.appdata.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata/")
 install(FILES io.github.petitlapin.Li-ri.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/")
-install(FILES data/Li-ri-icon-16x16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps/" RENAME io.github.petitlapin.Li-ri.png)
-install(FILES data/Li-ri-icon-32x32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps/" RENAME io.github.petitlapin.Li-ri.png)
-install(FILES data/Li-ri-icon-48x48.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/" RENAME io.github.petitlapin.Li-ri.png)
-install(FILES data/Li-ri-icon-64x64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps/" RENAME io.github.petitlapin.Li-ri.png)
-install(FILES data/Li-ri-icon-128x128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/" RENAME io.github.petitlapin.Li-ri.png)
+install(FILES Icons/Li-ri-icon-16x16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps/" RENAME io.github.petitlapin.Li-ri.png)
+install(FILES Icons/Li-ri-icon-32x32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps/" RENAME io.github.petitlapin.Li-ri.png)
+install(FILES Icons/Li-ri-icon-48x48.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/" RENAME io.github.petitlapin.Li-ri.png)
+install(FILES Icons/Li-ri-icon-64x64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps/" RENAME io.github.petitlapin.Li-ri.png)
+install(FILES Icons/Li-ri-icon-128x128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/" RENAME io.github.petitlapin.Li-ri.png)
 
 if(WIN32)
-  install(DIRECTORY ${CMAKE_SOURCE_DIR}/data/ DESTINATION bin)
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/Assets DESTINATION bin)
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/Icons DESTINATION bin)
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/Sounds DESTINATION bin)
 else()
-  install(DIRECTORY ${CMAKE_SOURCE_DIR}/data/ DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri")
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/Assets DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri")
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/Icons DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri")
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/Sounds DESTINATION "${CMAKE_INSTALL_DATADIR}/Li-ri")
 endif()
 option(RILI_ENABLE_IPO
diff --git a/CPackLists.txt b/CPackLists.txt
index 50673c4..79b15cf 100644
--- a/CPackLists.txt
+++ b/CPackLists.txt
@@ -17,7 +17,7 @@ if(WIN32)
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "${LIRI_EXECUTABLE_NAME}")
   set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${LIRI_EXECUTABLE_NAME}")
   #set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/installer\\\\gcompris-header.bmp")
-  set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/data\\\\li-ri.ico")
+  set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/Icons\\\\li-ri.ico")
   #set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/installer\\\\Liri-uninstall.ico")
   #set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp")
   #set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp")
@@ -31,7 +31,7 @@ if(WIN32)
   set(CPACK_NSIS_MUI_FINISHPAGE_RUN "${LIRI_EXECUTABLE_NAME}")
   set(CPACK_PACKAGE_VENDOR "Li-Ri team")
 else()
-  set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/data/Li-ri-icon-48x48.png")
+  set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/Icons/Li-ri-icon-48x48.png")
 endif()
 
 if(UNIX)
diff --git a/data/Li-ri-icon-128x128.png b/Icons/Li-ri-icon-128x128.png
similarity index 100%
rename from data/Li-ri-icon-128x128.png
rename to Icons/Li-ri-icon-128x128.png
diff --git a/data/Li-ri-icon-16x16.png b/Icons/Li-ri-icon-16x16.png
similarity index 100%
rename from data/Li-ri-icon-16x16.png
rename to Icons/Li-ri-icon-16x16.png
diff --git a/data/Li-ri-icon-32x32.png b/Icons/Li-ri-icon-32x32.png
similarity index 100%
rename from data/Li-ri-icon-32x32.png
rename to Icons/Li-ri-icon-32x32.png
diff --git a/data/Li-ri-icon-48x48.png b/Icons/Li-ri-icon-48x48.png
similarity index 100%
rename from data/Li-ri-icon-48x48.png
rename to Icons/Li-ri-icon-48x48.png
diff --git a/data/Li-ri-icon-64x64.png b/Icons/Li-ri-icon-64x64.png
similarity index 100%
rename from data/Li-ri-icon-64x64.png
rename to Icons/Li-ri-icon-64x64.png
diff --git a/data/li-ri.ico b/Icons/li-ri.ico
similarity index 100%
rename from data/li-ri.ico
rename to Icons/li-ri.ico
diff --git a/README.md b/README.md
index 6d3fb17..50981d7 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Polishyk Mykyta "zabidentwfan@ukr.net": musics ("menu\_zabiden.ogg", "ingame1\_z
 Copyright (c) 2006
 Dominique Roux-Serret: design & programming & graphics & website.
 
-Copyright (c) 2006 Maf464 (email charcosset.b@free.fr; website http://maf464.free.fr): ("menu\_maf.ogg", "ingame1\_maf.ogg", "ingame2\_maf.ogg")
+Copyright (c) 2006 (for "menu.mod", "ingame1.xm", "ingame2.xm") MAF464 (email charcosset.b@free.fr; website http://maf464.free.fr). This music licensed under GPL license. See COPYING for details
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
diff --git a/Sounds/ingame1.xm b/Sounds/ingame1.xm
new file mode 100644
index 0000000..0083ac4
Binary files /dev/null and b/Sounds/ingame1.xm differ
diff --git a/Sounds/ingame2.xm b/Sounds/ingame2.xm
new file mode 100644
index 0000000..d6bcf8a
Binary files /dev/null and b/Sounds/ingame2.xm differ
diff --git a/data/gamecontrollerdb.txt b/gamecontrollerdb.txt
similarity index 100%
rename from data/gamecontrollerdb.txt
rename to gamecontrollerdb.txt
diff --git a/src/level.cc b/src/level.cc
index be49ba9..91eebc3 100644
--- a/src/level.cc
+++ b/src/level.cc
@@ -40,7 +40,7 @@ bool Level::Load()
     unsigned char *Buf;
     long L, P = 2;
     int i, j;
-    char NameLevelFile[512] = "levels.dat";
+    char NameLevelFile[512] = "Assets/levels.dat";
 
     Utils::GetPath(NameLevelFile);
     L = Utils::LoadFile(NameLevelFile, Buf);
@@ -80,7 +80,7 @@ bool Level::Save()
     unsigned char *Buf;
     long P = 2;
     int i, j;
-    char NameLevelFile[512] = "levels.dat";
+    char NameLevelFile[512] = "Assets/levels.dat";
 
     // Allocate memory
     Buf = new unsigned char[sizeof(s_Level) * N + sizeof(int) + 1];
diff --git a/src/sprite.cc b/src/sprite.cc
index 452fec3..6ef4657 100644
--- a/src/sprite.cc
+++ b/src/sprite.cc
@@ -74,9 +74,8 @@ bool LoadLanguage()
     long L, P;
     int i;
     unsigned char *Buf;
-    char PathFile[512];
-
-    strcpy(PathFile, Languages[Pref.Language]);
+    char PathFile[512] = "Assets/";
+    strcat(PathFile, Languages[Pref.Language]);
     Utils::GetPath(PathFile);
     if (Utils::FileExists(PathFile) == false) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find '%s'", Languages[Pref.Language]);
@@ -108,7 +107,7 @@ bool LoadSprites()
     unsigned char *Buf;
     int NSp;
 
-    char PathFile[512] = "language.dat";
+    char PathFile[512] = "Assets/language.dat";
     Utils::GetPath(PathFile);
 
     // Initialize characters table for texts
@@ -129,7 +128,7 @@ bool LoadSprites()
     // *** Loads the languages file ***
     // ********************************
     if (Utils::FileExists(PathFile) == false) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'language.dat'");
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'Assets/language.dat'");
         return false;
     }
     L = Utils::LoadFile(PathFile, Buf);
@@ -166,10 +165,10 @@ bool LoadSprites()
 
     // *** loads sprites file ***
     // **************************
-    strcpy(PathFile, "sprites.dat");
+    strcpy(PathFile, "Assets/sprites.dat");
     Utils::GetPath(PathFile);
     if (Utils::FileExists(PathFile) == false) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'sprites.dat'");
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find 'Assets/sprites.dat'");
         return false;
     }
     L = Utils::LoadFile(PathFile, Buf);