--- a/dbsetup.py
+++ b/dbsetup.py
@@ -22,7 +22,7 @@
 # Import all modules which represents a SQLAlchemy model;
 # they have corresponding tables that are needed to be created
 from swtstore.classes.models import Sweet, Context, Client
-from swtstore.classes.models.um import User, Group, Membership
+from swtstore.classes.models import User, Group, Membership
 
 
 if __name__ == '__main__':
--- a/swtstore/classes/models/__init__.py
+++ b/swtstore/classes/models/__init__.py
@@ -1,6 +1,6 @@
 from user import User
-#from group import Group
-#from membership import Membership
+from group import Group
+from membership import Membership
 from context import Context
 from sweet import Sweet
 from client import Client, AuthorizedClients