diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py
index d130b3174..11fa79bb9 100644
--- a/gui/copySelectDialog.py
+++ b/gui/copySelectDialog.py
@@ -20,7 +20,7 @@
 
 # noinspection PyPackageRequirements
 import wx
-from service.eftPort import EFT_OPTIONS
+from service.port.eft import EFT_OPTIONS
 from service.settings import SettingsProvider
 
 
diff --git a/gui/esiFittings.py b/gui/esiFittings.py
index af3da77a5..5b7dec36d 100644
--- a/gui/esiFittings.py
+++ b/gui/esiFittings.py
@@ -15,7 +15,7 @@ import gui.globalEvents as GE
 from logbook import Logger
 from service.esi import Esi
 from service.esiAccess import APIException
-from service.port import ESIExportException
+from service.port.port import ESIExportException
 
 pyfalog = Logger(__name__)
 
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index c89914e44..ced466577 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -76,8 +76,7 @@ from service.esiAccess import SsoMode
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
 from eos.db.saveddata.queries import getFit as db_getFit
-from service.port import Port, IPortUser
-from service.efsPort import EfsPort
+from service.port import Port, IPortUser, EfsPort
 from service.settings import HTMLExportSettings
 
 from time import gmtime, strftime
diff --git a/service/port/__init__.py b/service/port/__init__.py
new file mode 100644
index 000000000..2e884d214
--- /dev/null
+++ b/service/port/__init__.py
@@ -0,0 +1,2 @@
+from .efs import EfsPort
+from .port import Port, IPortUser
diff --git a/service/efsPort.py b/service/port/efs.py
similarity index 100%
rename from service/efsPort.py
rename to service/port/efs.py
diff --git a/service/eftPort.py b/service/port/eft.py
similarity index 100%
rename from service/eftPort.py
rename to service/port/eft.py
diff --git a/service/port.py b/service/port/port.py
similarity index 99%
rename from service/port.py
rename to service/port/port.py
index 7e7ec7aea..5b942263e 100644
--- a/service/port.py
+++ b/service/port/port.py
@@ -51,7 +51,7 @@ from utils.strfunctions import sequential_rep, replace_ltgt
 from abc import ABCMeta, abstractmethod
 
 from service.esi import Esi
-from service.eftPort import EftPort, SLOT_ORDER as EFT_SLOT_ORDER
+from service.port.eft import EftPort, SLOT_ORDER as EFT_SLOT_ORDER
 from collections import OrderedDict