diff --git a/conf/include.php b/conf/include.php
index aed28e0..556b3b8 100644
--- a/conf/include.php
+++ b/conf/include.php
@@ -17,12 +17,12 @@
 /**
  * Custom 'data' folder path
  */
-define('APP_DATA_FOLDER_PATH', '__DATA_DIR__/');
+define('APP_DATA_FOLDER_PATH', '__DATA_DIR__/data/');
 
 /**
  * Additional configuration file name
  */
-define('APP_CONFIGURATION_NAME', '__DATA_DIR__/application.ini');
+//define('APP_CONFIGURATION_NAME', '__DATA_DIR__/application.ini');
 
 /**
  * Also update extensions on upgrade
diff --git a/manifest.toml b/manifest.toml
index 9111ce4..88acf86 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -60,7 +60,8 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
-
+    subdirs = ["data"]
+    
     [resources.permissions]
     main.url = "/"