diff --git a/main.py b/main.py
deleted file mode 100644
index 5ed5689..0000000
--- a/main.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from pfbudget import Manager, run
-
-if __name__ == "__main__":
-    command, args = run()
-    Manager(command, args).start()
diff --git a/pfbudget/__init__.py b/pfbudget/__init__.py
index 8b5a5fa..2a836a1 100644
--- a/pfbudget/__init__.py
+++ b/pfbudget/__init__.py
@@ -1,8 +1,8 @@
-__all__ = ["run", "parse_data", "categorize_data"]
+__all__ = ["argparser", "Manager", "parse_data", "categorize_data"]
 __author__ = "Luís Murta"
 __version__ = "0.1"
 
 from pfbudget.core.categories import categorize_data
 from pfbudget.core.manager import Manager
-from pfbudget.cli.runnable import run
+from pfbudget.cli.runnable import argparser
 from pfbudget.input.parsers import parse_data
diff --git a/pfbudget/__main__.py b/pfbudget/__main__.py
index eba7182..a5fa7de 100644
--- a/pfbudget/__main__.py
+++ b/pfbudget/__main__.py
@@ -1,4 +1,8 @@
-from pfbudget.cli.runnable import run
+import pfbudget
+
 
 if __name__ == "__main__":
-    run()
+    argparser = pfbudget.argparser()
+    args = vars(argparser.parse_args())
+    assert "op" in args, "No operation selected"
+    pfbudget.Manager(args["op"], args).start()