diff --git a/src/Nadeko.Bot.Db/Models/ClubInfo.cs b/src/Nadeko.Bot.Db/Models/club/ClubInfo.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/ClubInfo.cs
rename to src/Nadeko.Bot.Db/Models/club/ClubInfo.cs
diff --git a/src/Nadeko.Bot.Db/Models/BankUser.cs b/src/Nadeko.Bot.Db/Models/currency/BankUser.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/BankUser.cs
rename to src/Nadeko.Bot.Db/Models/currency/BankUser.cs
diff --git a/src/Nadeko.Bot.Db/Models/NadekoExpression.cs b/src/Nadeko.Bot.Db/Models/expr/NadekoExpression.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/NadekoExpression.cs
rename to src/Nadeko.Bot.Db/Models/expr/NadekoExpression.cs
diff --git a/src/Nadeko.Bot.Db/Models/Quote.cs b/src/Nadeko.Bot.Db/Models/expr/Quote.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/Quote.cs
rename to src/Nadeko.Bot.Db/Models/expr/Quote.cs
diff --git a/src/Nadeko.Bot.Db/Models/FilterChannelId.cs b/src/Nadeko.Bot.Db/Models/filter/FilterChannelId.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/FilterChannelId.cs
rename to src/Nadeko.Bot.Db/Models/filter/FilterChannelId.cs
diff --git a/src/Nadeko.Bot.Db/Models/FilterLinksChannelId.cs b/src/Nadeko.Bot.Db/Models/filter/FilterLinksChannelId.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/FilterLinksChannelId.cs
rename to src/Nadeko.Bot.Db/Models/filter/FilterLinksChannelId.cs
diff --git a/src/Nadeko.Bot.Db/Models/FilteredWord.cs b/src/Nadeko.Bot.Db/Models/filter/FilteredWord.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/FilteredWord.cs
rename to src/Nadeko.Bot.Db/Models/filter/FilteredWord.cs
diff --git a/src/Nadeko.Bot.Db/Models/BanTemplate.cs b/src/Nadeko.Bot.Db/Models/punish/BanTemplate.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/BanTemplate.cs
rename to src/Nadeko.Bot.Db/Models/punish/BanTemplate.cs
diff --git a/src/Nadeko.Bot.Db/Models/MutedUserId.cs b/src/Nadeko.Bot.Db/Models/punish/MutedUserId.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/MutedUserId.cs
rename to src/Nadeko.Bot.Db/Models/punish/MutedUserId.cs
diff --git a/src/Nadeko.Bot.Db/Models/PunishmentAction.cs b/src/Nadeko.Bot.Db/Models/punish/PunishmentAction.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/PunishmentAction.cs
rename to src/Nadeko.Bot.Db/Models/punish/PunishmentAction.cs
diff --git a/src/Nadeko.Bot.Db/Models/WarnExpireAction.cs b/src/Nadeko.Bot.Db/Models/punish/WarnExpireAction.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/WarnExpireAction.cs
rename to src/Nadeko.Bot.Db/Models/punish/WarnExpireAction.cs
diff --git a/src/Nadeko.Bot.Db/Models/Warning.cs b/src/Nadeko.Bot.Db/Models/punish/Warning.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/Warning.cs
rename to src/Nadeko.Bot.Db/Models/punish/Warning.cs
diff --git a/src/Nadeko.Bot.Db/Models/WarningPunishment.cs b/src/Nadeko.Bot.Db/Models/punish/WarningPunishment.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/WarningPunishment.cs
rename to src/Nadeko.Bot.Db/Models/punish/WarningPunishment.cs
diff --git a/src/Nadeko.Bot.Db/Models/SlowmodeIgnoredRole.cs b/src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredRole.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/SlowmodeIgnoredRole.cs
rename to src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredRole.cs
diff --git a/src/Nadeko.Bot.Db/Models/SlowmodeIgnoredUser.cs b/src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredUser.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/SlowmodeIgnoredUser.cs
rename to src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredUser.cs
diff --git a/src/Nadeko.Bot.Db/Models/PatronQuota.cs b/src/Nadeko.Bot.Db/Models/support/PatronQuota.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/PatronQuota.cs
rename to src/Nadeko.Bot.Db/Models/support/PatronQuota.cs
diff --git a/src/Nadeko.Bot.Db/Models/RewardedUser.cs b/src/Nadeko.Bot.Db/Models/support/RewardedUser.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/RewardedUser.cs
rename to src/Nadeko.Bot.Db/Models/support/RewardedUser.cs
diff --git a/src/Nadeko.Bot.Db/Models/UnbanTimer.cs b/src/Nadeko.Bot.Db/Models/untimer/UnbanTimer.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/UnbanTimer.cs
rename to src/Nadeko.Bot.Db/Models/untimer/UnbanTimer.cs
diff --git a/src/Nadeko.Bot.Db/Models/UnmuteTimer.cs b/src/Nadeko.Bot.Db/Models/untimer/UnmuteTimer.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/UnmuteTimer.cs
rename to src/Nadeko.Bot.Db/Models/untimer/UnmuteTimer.cs
diff --git a/src/Nadeko.Bot.Db/Models/UnroleTimer.cs b/src/Nadeko.Bot.Db/Models/untimer/UnroleTimer.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/UnroleTimer.cs
rename to src/Nadeko.Bot.Db/Models/untimer/UnroleTimer.cs
diff --git a/src/Nadeko.Bot.Db/Models/UserXpStats.cs b/src/Nadeko.Bot.Db/Models/xp/UserXpStats.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/UserXpStats.cs
rename to src/Nadeko.Bot.Db/Models/xp/UserXpStats.cs
diff --git a/src/Nadeko.Bot.Db/Models/XpSettings.cs b/src/Nadeko.Bot.Db/Models/xp/XpSettings.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/XpSettings.cs
rename to src/Nadeko.Bot.Db/Models/xp/XpSettings.cs
diff --git a/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj b/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj
index 0921b5ce7..54bfe5472 100644
--- a/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj
+++ b/src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj
@@ -28,4 +28,10 @@
       <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
     </ItemGroup>
 
+
+
+
+
+
+
 </Project>
diff --git a/src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj b/src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj
index e0f6e1f25..b0342d0ae 100644
--- a/src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj
+++ b/src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj
@@ -15,5 +15,10 @@
       <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj" />
       <ProjectReference Include="..\Nadeko.Bot.Modules.Gambling\Nadeko.Bot.Modules.Gambling.csproj" />
     </ItemGroup>
+    
+    <ItemGroup>
+      <Folder Include="UserPunish\_common\" />
+      <Folder Include="UserPunish\_common\db\" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/Nadeko.Bot.Db/Models/XpShopOwnedItem.cs b/src/Nadeko.Bot.Modules.Xp/_Common/db/XpShopOwnedItem.cs
similarity index 100%
rename from src/Nadeko.Bot.Db/Models/XpShopOwnedItem.cs
rename to src/Nadeko.Bot.Modules.Xp/_Common/db/XpShopOwnedItem.cs