diff --git a/inc/Data/FiltersParseResult.php b/inc/Data/Model/FiltersParseResult.php
similarity index 89%
rename from inc/Data/FiltersParseResult.php
rename to inc/Data/Model/FiltersParseResult.php
index 1eb1acd8..89881c46 100644
--- a/inc/Data/FiltersParseResult.php
+++ b/inc/Data/Model/FiltersParseResult.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 class FiltersParseResult {
diff --git a/inc/Data/Flags.php b/inc/Data/Model/Flags.php
similarity index 98%
rename from inc/Data/Flags.php
rename to inc/Data/Model/Flags.php
index 00d37f12..6f843484 100644
--- a/inc/Data/Flags.php
+++ b/inc/Data/Model/Flags.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 class Flags {
diff --git a/inc/Data/PageFetchResult.php b/inc/Data/Model/PageFetchResult.php
similarity index 87%
rename from inc/Data/PageFetchResult.php
rename to inc/Data/Model/PageFetchResult.php
index b33e7ac2..62be0156 100644
--- a/inc/Data/PageFetchResult.php
+++ b/inc/Data/Model/PageFetchResult.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 /**
diff --git a/inc/Data/SearchFilters.php b/inc/Data/Model/SearchFilters.php
similarity index 94%
rename from inc/Data/SearchFilters.php
rename to inc/Data/Model/SearchFilters.php
index 36beb921..8552bf00 100644
--- a/inc/Data/SearchFilters.php
+++ b/inc/Data/Model/SearchFilters.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 /**