diff --git a/__main__.py b/__main__.py
new file mode 120000
index 0000000..1258968
--- /dev/null
+++ b/__main__.py
@@ -0,0 +1 @@
+template/main.py.template
\ No newline at end of file
diff --git a/midiinput/stepmidiinput.py b/engine/midiinput/stepmidiinput.py
similarity index 100%
rename from midiinput/stepmidiinput.py
rename to engine/midiinput/stepmidiinput.py
diff --git a/laborejo b/laborejo
deleted file mode 100755
index 834f613..0000000
--- a/laborejo
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-from template import start #Executes various start up checks and sets up our environment likes search paths
-
-from qtgui import mainwindow #which in turn imports the engine and starts the engine
-with start.profiler():        
-    mainwindow.MainWindow().qtApp.exec_()
-    #Program is over. Code here does not get executed. Quit is done via NSM in mainWindow._nsmQuit
diff --git a/laborejo b/laborejo
new file mode 120000
index 0000000..3858644
--- /dev/null
+++ b/laborejo
@@ -0,0 +1 @@
+template/launcher.template
\ No newline at end of file
diff --git a/qtgui/mainwindow.py b/qtgui/mainwindow.py
index 4666bd6..6e19672 100644
--- a/qtgui/mainwindow.py
+++ b/qtgui/mainwindow.py
@@ -36,7 +36,7 @@ translate = QtCore.QCoreApplication.translate
 
 #Our modules
 import engine.api as api
-from midiinput.stepmidiinput import stepMidiInput  #singleton instance
+from engine.midiinput.stepmidiinput import stepMidiInput  #singleton instance
 from .constantsAndConfigs import constantsAndConfigs
 from .menu import MenuActionDatabase
 from .scoreview import ScoreView
diff --git a/qtgui/menu.py b/qtgui/menu.py
index fe564f5..f957738 100644
--- a/qtgui/menu.py
+++ b/qtgui/menu.py
@@ -34,7 +34,7 @@ translate = QtCore.QCoreApplication.translate
 
 #Our modules
 import engine.api as api
-from midiinput.stepmidiinput import stepMidiInput  #singleton instance
+from engine.midiinput.stepmidiinput import stepMidiInput  #singleton instance
 from .constantsAndConfigs import constantsAndConfigs
 from .submenus import SecondaryClefMenu, SecondaryKeySignatureMenu, SecondaryDynamicsMenu, SecondaryMetricalInstructionMenu, SecondaryTempoChangeMenu, SecondaryTemporaryTempoChangeMenu, SecondarySplitMenu, TransposeMenu, pedalNoteChooser, SecondaryProperties, SecondaryProgramChangeMenu, SecondaryChannelChangeMenu, ChooseOne, forwardText
 
diff --git a/qtgui/submenus.py b/qtgui/submenus.py
index 3e765b1..35024b3 100644
--- a/qtgui/submenus.py
+++ b/qtgui/submenus.py
@@ -35,7 +35,7 @@ from template.qtgui.submenus import *
 
 #Our own files
 import engine.api as api
-from midiinput.stepmidiinput import stepMidiInput  #singleton instance. Don't allow midi input when submenus are open.
+from engine.midiinput.stepmidiinput import stepMidiInput  #singleton instance. Don't allow midi input when submenus are open.
 from .constantsAndConfigs import constantsAndConfigs
 from .designer.tickWidget import Ui_tickWidget