diff --git a/ogn/aprs_parser.py b/ogn/aprs_parser.py
index 160d17d..e4915f1 100644
--- a/ogn/aprs_parser.py
+++ b/ogn/aprs_parser.py
@@ -1,6 +1,4 @@
-from .model.beacon import Beacon
-from .model.position import Position
-from .model.receiver import Receiver
+from .model import Beacon, Position, Receiver
 
 
 def parse_aprs(text):
diff --git a/ogn/db.py b/ogn/db.py
index e9692f7..3266b38 100644
--- a/ogn/db.py
+++ b/ogn/db.py
@@ -1,10 +1,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from ogn.model.base import Base
-from ogn.model.position import Position
-from ogn.model.receiver import Receiver
-from ogn.model.flarm import Flarm
+from .model import Base, Position, Receiver, Flarm
 
 
 # prepare db
diff --git a/ogn/db_utils.py b/ogn/db_utils.py
index 72e42d7..e38b6fc 100644
--- a/ogn/db_utils.py
+++ b/ogn/db_utils.py
@@ -1,8 +1,7 @@
 from urllib.request import urlopen
 
 from .db import session
-from .model.address_origin import AddressOrigin
-from .model.flarm import Flarm
+from .model import AddressOrigin, Flarm
 
 
 def get_devices_from_ddb():
diff --git a/ogn/model/__init__.py b/ogn/model/__init__.py
index 8b13789..0866b54 100644
--- a/ogn/model/__init__.py
+++ b/ogn/model/__init__.py
@@ -1 +1,7 @@
-
+from .address_origin import AddressOrigin
+from .aircraft_type import AircraftType
+from .base import Base
+from .beacon import Beacon
+from .flarm import Flarm
+from .position import Position
+from .receiver import Receiver
diff --git a/ogn/ognproceed.py b/ogn/ognproceed.py
index 750fc97..cd47bea 100644
--- a/ogn/ognproceed.py
+++ b/ogn/ognproceed.py
@@ -3,7 +3,8 @@ from time import time
 
 from ogn import db_utils
 from ogn import settings
-from ogn.aprs_parser import *
+from ogn.aprs_parser import parse_aprs
+from .model import Position, Receiver
 
 
 def proceed():