diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index d981fcf..1cae6ea
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,9 @@
 custom.ini
 
-# Ignore images content
+# Ignore images & thumbnails directories (legacy)
 i/*
-!i/.gitkeep
-
-# Ignore thumbnails content
 t/*
-!t/.gitkeep
 
-# Ignore all files in data but keep folder itself (and logs subfolder)
+# Ignore all files in data but keep directory itself
 data/*
 !data/.gitkeep
-!data/logs/
-
-# Ignore all logs files but keep folder itself
-data/logs/*
-!data/logs/.gitkeep
diff --git a/config.ini b/config.ini
index fc1e3da..db776ec 100755
--- a/config.ini
+++ b/config.ini
@@ -38,8 +38,8 @@ pass = demo
 ;visitor[user] = pass
 
 [directories]
-images_path = i/
-thumbnails_path = t/
+images_path = data/i/
+thumbnails_path = data/t/
 logs_path = data/logs/
 
 [system]
diff --git a/i/.gitkeep b/i/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/t/.gitkeep b/t/.gitkeep
deleted file mode 100644
index e69de29..0000000