diff --git a/src/wuttafarm/db/model/__init__.py b/src/wuttafarm/db/model/__init__.py
index 367bc1c..277a92c 100644
--- a/src/wuttafarm/db/model/__init__.py
+++ b/src/wuttafarm/db/model/__init__.py
@@ -30,9 +30,9 @@ from wuttjamaican.db.model import *
 from .users import WuttaFarmUser
 
 # wuttafarm proper models
-from .assets import AssetType, Asset, AssetParent
-from .land import LandType, LandAsset
-from .structures import StructureType, StructureAsset
-from .animals import AnimalType, AnimalAsset
-from .groups import GroupAsset
+from .asset import AssetType, Asset, AssetParent
+from .asset_land import LandType, LandAsset
+from .asset_structure import StructureType, StructureAsset
+from .asset_animal import AnimalType, AnimalAsset
+from .asset_group import GroupAsset
 from .logs import LogType, ActivityLog
diff --git a/src/wuttafarm/db/model/assets.py b/src/wuttafarm/db/model/asset.py
similarity index 100%
rename from src/wuttafarm/db/model/assets.py
rename to src/wuttafarm/db/model/asset.py
diff --git a/src/wuttafarm/db/model/animals.py b/src/wuttafarm/db/model/asset_animal.py
similarity index 97%
rename from src/wuttafarm/db/model/animals.py
rename to src/wuttafarm/db/model/asset_animal.py
index 8c0df35..b50c41b 100644
--- a/src/wuttafarm/db/model/animals.py
+++ b/src/wuttafarm/db/model/asset_animal.py
@@ -28,7 +28,7 @@ from sqlalchemy import orm
 
 from wuttjamaican.db import model
 
-from wuttafarm.db.model.assets import AssetMixin, add_asset_proxies
+from wuttafarm.db.model.asset import AssetMixin, add_asset_proxies
 
 
 class AnimalType(model.Base):
diff --git a/src/wuttafarm/db/model/groups.py b/src/wuttafarm/db/model/asset_group.py
similarity index 95%
rename from src/wuttafarm/db/model/groups.py
rename to src/wuttafarm/db/model/asset_group.py
index 84453a7..fe82bdd 100644
--- a/src/wuttafarm/db/model/groups.py
+++ b/src/wuttafarm/db/model/asset_group.py
@@ -25,7 +25,7 @@ Model definition for Groups
 
 from wuttjamaican.db import model
 
-from wuttafarm.db.model.assets import AssetMixin, add_asset_proxies
+from wuttafarm.db.model.asset import AssetMixin, add_asset_proxies
 
 
 class GroupAsset(AssetMixin, model.Base):
diff --git a/src/wuttafarm/db/model/land.py b/src/wuttafarm/db/model/asset_land.py
similarity index 97%
rename from src/wuttafarm/db/model/land.py
rename to src/wuttafarm/db/model/asset_land.py
index 1221c63..bbd7bf0 100644
--- a/src/wuttafarm/db/model/land.py
+++ b/src/wuttafarm/db/model/asset_land.py
@@ -28,7 +28,7 @@ from sqlalchemy import orm
 
 from wuttjamaican.db import model
 
-from wuttafarm.db.model.assets import AssetMixin, add_asset_proxies
+from wuttafarm.db.model.asset import AssetMixin, add_asset_proxies
 
 
 class LandType(model.Base):
diff --git a/src/wuttafarm/db/model/structures.py b/src/wuttafarm/db/model/asset_structure.py
similarity index 97%
rename from src/wuttafarm/db/model/structures.py
rename to src/wuttafarm/db/model/asset_structure.py
index 8c5371c..7f4fc23 100644
--- a/src/wuttafarm/db/model/structures.py
+++ b/src/wuttafarm/db/model/asset_structure.py
@@ -28,7 +28,7 @@ from sqlalchemy import orm
 
 from wuttjamaican.db import model
 
-from wuttafarm.db.model.assets import AssetMixin, add_asset_proxies
+from wuttafarm.db.model.asset import AssetMixin, add_asset_proxies
 
 
 class StructureType(model.Base):
diff --git a/src/wuttafarm/web/views/asset_types.py b/src/wuttafarm/web/views/asset_types.py
index 775fa3a..b9f560a 100644
--- a/src/wuttafarm/web/views/asset_types.py
+++ b/src/wuttafarm/web/views/asset_types.py
@@ -23,7 +23,7 @@
 Master view for Asset Types
 """
 
-from wuttafarm.db.model.assets import AssetType
+from wuttafarm.db.model import AssetType
 from wuttafarm.web.views import WuttaFarmMasterView
 
 
diff --git a/src/wuttafarm/web/views/groups.py b/src/wuttafarm/web/views/groups.py
index 21d7ed4..ae50b89 100644
--- a/src/wuttafarm/web/views/groups.py
+++ b/src/wuttafarm/web/views/groups.py
@@ -24,7 +24,7 @@ Master view for Groups
 """
 
 from wuttafarm.web.views.assets import AssetMasterView
-from wuttafarm.db.model.groups import GroupAsset
+from wuttafarm.db.model import GroupAsset
 
 
 class GroupView(AssetMasterView):
diff --git a/src/wuttafarm/web/views/land.py b/src/wuttafarm/web/views/land.py
index aad15e7..22827a0 100644
--- a/src/wuttafarm/web/views/land.py
+++ b/src/wuttafarm/web/views/land.py
@@ -25,7 +25,7 @@ Master view for Land Types
 
 from webhelpers2.html import HTML, tags
 
-from wuttafarm.db.model.land import LandType, LandAsset
+from wuttafarm.db.model import LandType, LandAsset
 from wuttafarm.web.views.assets import AssetTypeMasterView, AssetMasterView
 from wuttafarm.web.forms.schema import LandTypeRef