refactoring for name improvements - account model

server/src/uds/models/ServicesPool.py

@@ -52,7 +52,7 @@ from uds.models.Group import Group
 from uds.models.Image import Image
 from uds.models.ServicesPoolGroup import ServicesPoolGroup
 from uds.models.Calendar import Calendar
-from uds.models.Account import Account
+from uds.models.account import Account
 
 from uds.models.Util import NEVER
 from uds.models.Util import getSqlDatetime

server/src/uds/models/__init__.py

@@ -98,8 +98,8 @@ from .CalendarAccess import CalendarAccess, CalendarAccessMeta
 from .CalendarAction import CalendarAction
 
 # Accounting
-from .Account import Account
-from .AccountUsage import AccountUsage
+from .account import Account
+from .account_usage import AccountUsage
 
 # Proxies
 from .Proxy import Proxy

server/src/uds/models/account_usage.py

@@ -32,12 +32,14 @@ import logging
 
 from django.db import models
 
-from uds.models.UUIDModel import UUIDModel
-from uds.models.Account import Account
-from uds.models.user_service import UserService
-from uds.models.Util import NEVER
 from uds.core.util.tools import secondsToTimeString
 
+from .UUIDModel import UUIDModel
+from .account import Account
+from .user_service import UserService
+from .Util import NEVER
+
+
 logger = logging.getLogger(__name__)