diff --git a/core/Modmanager.py b/core/Modmanager/Modmanager.py
similarity index 98%
rename from core/Modmanager.py
rename to core/Modmanager/Modmanager.py
index a542d04..7360a70 100644
--- a/core/Modmanager.py
+++ b/core/Modmanager/Modmanager.py
@@ -7,12 +7,7 @@
 from time import sleep
 from lxml import etree
 
-import sys
-sys.path.insert(0, '{}\\core'.format(os.getcwd()))
-#print(sys.path) #FIXME should change folder structure
-
-import downloader, RWmanager
-
+from .. import RWmanager, downloader
 
 log = logging.getLogger('RAMS.ModManager')
 c_steamregpath = "Software\\Valve\\Steam"
diff --git a/core/Modmanager/__init__.py b/core/Modmanager/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/main.py b/main.py
index 3cc9d23..c8ba3b0 100644
--- a/main.py
+++ b/main.py
@@ -10,7 +10,8 @@
 sys.path.insert(0, '{}\\core'.format(os.getcwd()))
 #print(sys.path)
 
-import downloader, Modmanager, RWmanager
+from core import downloader, RWmanager, upload
+from core.Modmanager import Modmanager
 
 currentdir = os.getcwd()
 Version = 0.54 #dev