diff --git a/bin/yunohost b/bin/yunohost
index 4c0919f7..6b253334 100755
--- a/bin/yunohost
+++ b/bin/yunohost
@@ -4,10 +4,13 @@
 import sys
 import os.path
 
+from_source = False
+
 # Run from source
 basedir = os.path.abspath('%s/../' % os.path.dirname(__file__))
-if os.path.isdir('%s/src' % basedir):
-    sys.path.insert(0, '%s/src' % basedir)
+if os.path.isdir('%s/moulinette' % basedir):
+    sys.path.insert(0, basedir)
+    from_source = True
 
 from moulinette import init, cli, MoulinetteError
 from moulinette.helpers import YunoHostError, colorize
@@ -17,7 +20,7 @@ from moulinette.helpers import YunoHostError, colorize
 
 if __name__ == '__main__':
     # Run from source
-    init(_from_source=True)
+    init(_from_source=from_source)
 
     # Additional arguments
     use_cache = True
diff --git a/bin/yunohost-api b/bin/yunohost-api
index 1c1538a8..744e16b7 100755
--- a/bin/yunohost-api
+++ b/bin/yunohost-api
@@ -4,10 +4,13 @@
 import sys
 import os.path
 
+from_source = False
+
 # Run from source
-basedir = os.path.abspath(os.path.dirname(__file__) +'/../')
-if os.path.isdir(basedir +'/src'):
-    sys.path.append(basedir +'/src')
+basedir = os.path.abspath('%s/../' % os.path.dirname(__file__))
+if os.path.isdir('%s/moulinette' % basedir):
+    sys.path.insert(0, basedir)
+    from_source = True
 
 from moulinette import init, api, MoulinetteError
 
@@ -29,15 +32,13 @@ def is_installed():
 
 if __name__ == '__main__':
     # Run from source
-    init(_from_source=True)
+    init(_from_source=from_source)
 
     # Additional arguments
     use_cache = True
     if '--no-cache' in sys.argv:
         use_cache = False
         sys.argv.remove('--no-cache')
-    if '--debug' in sys.argv:
-        sys.argv.remove('--debug')
     # TODO: Add log argument
 
     try:
diff --git a/src/moulinette/__init__.py b/moulinette/__init__.py
similarity index 100%
rename from src/moulinette/__init__.py
rename to moulinette/__init__.py
diff --git a/src/moulinette/actionsmap.py b/moulinette/actionsmap.py
similarity index 100%
rename from src/moulinette/actionsmap.py
rename to moulinette/actionsmap.py
diff --git a/src/moulinette/authenticators/__init__.py b/moulinette/authenticators/__init__.py
similarity index 100%
rename from src/moulinette/authenticators/__init__.py
rename to moulinette/authenticators/__init__.py
diff --git a/src/moulinette/authenticators/ldap.py b/moulinette/authenticators/ldap.py
similarity index 100%
rename from src/moulinette/authenticators/ldap.py
rename to moulinette/authenticators/ldap.py
diff --git a/src/moulinette/core.py b/moulinette/core.py
similarity index 100%
rename from src/moulinette/core.py
rename to moulinette/core.py
diff --git a/src/moulinette/helpers.py b/moulinette/helpers.py
similarity index 100%
rename from src/moulinette/helpers.py
rename to moulinette/helpers.py
diff --git a/src/moulinette/interfaces/__init__.py b/moulinette/interfaces/__init__.py
similarity index 100%
rename from src/moulinette/interfaces/__init__.py
rename to moulinette/interfaces/__init__.py
diff --git a/src/moulinette/interfaces/api.py b/moulinette/interfaces/api.py
similarity index 100%
rename from src/moulinette/interfaces/api.py
rename to moulinette/interfaces/api.py
diff --git a/src/moulinette/interfaces/cli.py b/moulinette/interfaces/cli.py
similarity index 100%
rename from src/moulinette/interfaces/cli.py
rename to moulinette/interfaces/cli.py
diff --git a/src/moulinette/package.py b/moulinette/package.py
similarity index 100%
rename from src/moulinette/package.py
rename to moulinette/package.py
diff --git a/src/moulinette/package.py.in b/moulinette/package.py.in
similarity index 100%
rename from src/moulinette/package.py.in
rename to moulinette/package.py.in