diff --git a/README.md b/README.md
index 74d1f4d..c4e56e3 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Vault is a simple Python password manager. It allows you to securely save secret
 
 ## Basic usage
 
-![Demo](img/demo.gif)
+![Demo](https://github.com/gabfl/vault/blob/master/img/demo.gif?raw=true)
 
 ## Installation and setup
 
diff --git a/img/demo.gif b/img/demo.gif
index c07c0a0..5fb082c 100644
Binary files a/img/demo.gif and b/img/demo.gif differ
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..bbf3963
--- /dev/null
+++ b/main.py
@@ -0,0 +1,8 @@
+"""
+    Just run:
+    python3 main.py
+"""
+
+from src.vault import *
+
+main()
diff --git a/setup.py b/setup.py
index 8d1dd57..8d19b23 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 try:
     import pypandoc
@@ -8,18 +8,18 @@
 
 setup (
     name = 'pyvault',
-    version = '1.3b',
+    version = '1.4',
     description = 'Python password manager',
     long_description = long_description,
     author = 'Gabriel Bordeaux',
     author_email = 'pypi@gab.lc',
     url = 'https://github.com/gabfl/vault',
     license = 'MIT',
-    packages = ['vault', 'vault.lib'],
+    packages = find_packages(),
     install_requires = ['pycryptodome', 'pyperclip', 'tabulate', 'argparse'], # external dependencies
     entry_points = {
         'console_scripts': [
-            'vault = vault.vault:main',
+            'vault = src.vault:main',
         ],
     },
 )
diff --git a/vault/__init__.py b/src/__init__.py
similarity index 100%
rename from vault/__init__.py
rename to src/__init__.py
diff --git a/vault/lib/Config.py b/src/lib/Config.py
similarity index 100%
rename from vault/lib/Config.py
rename to src/lib/Config.py
diff --git a/vault/lib/ImportExport.py b/src/lib/ImportExport.py
similarity index 98%
rename from vault/lib/ImportExport.py
rename to src/lib/ImportExport.py
index 7fe5622..a231882 100644
--- a/vault/lib/ImportExport.py
+++ b/src/lib/ImportExport.py
@@ -58,7 +58,7 @@ def importFromJson(self):
             Import items to the vault
         """
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         # Unlock the vault with the existing key
         self.unlockVault()
@@ -120,7 +120,7 @@ def importFromNative(self):
 
         import pickle
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         # Unlock the vault with the existing key
         self.unlockVault()
diff --git a/vault/lib/Misc.py b/src/lib/Misc.py
similarity index 100%
rename from vault/lib/Misc.py
rename to src/lib/Misc.py
diff --git a/vault/lib/Vault.py b/src/lib/Vault.py
similarity index 99%
rename from vault/lib/Vault.py
rename to src/lib/Vault.py
index 4a09236..62cb9ad 100644
--- a/vault/lib/Vault.py
+++ b/src/lib/Vault.py
@@ -300,7 +300,7 @@ def get(self, id = None):
             Quickly retrieve an item from the vault with its ID
         """
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         if id is None: # If the user did not pre-select an item
             print()
@@ -487,7 +487,7 @@ def itemDelete(self, itemKey):
             Delete an item
         """
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         try:
             # Get item
@@ -745,7 +745,7 @@ def categoryDelete(self):
             Quickly delete a category from the vault with its ID
         """
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         print()
         try:
@@ -800,7 +800,7 @@ def categoryRename(self):
             Quickly rename a category from the vault with its ID
         """
 
-        from lib.Misc import confirm
+        from .Misc import confirm
 
         print()
         try:
diff --git a/vault/lib/__init__.py b/src/lib/__init__.py
similarity index 100%
rename from vault/lib/__init__.py
rename to src/lib/__init__.py
diff --git a/vault/vault.py b/src/vault.py
similarity index 96%
rename from vault/vault.py
rename to src/vault.py
index 86a885a..2497545 100755
--- a/vault/vault.py
+++ b/src/vault.py
@@ -4,10 +4,10 @@
 
 import argparse
 
-from .lib.Vault import Vault
-from .lib.Config import Config
-from .lib.ImportExport import ImportExport
-from .lib.Misc import *
+from src.lib.Vault import Vault
+from src.lib.Config import Config
+from src.lib.ImportExport import ImportExport
+from src.lib.Misc import *
 
 # Parse arguments
 parser = argparse.ArgumentParser()