diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index fbec3fb5..f2a95236 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -57,10 +57,10 @@ Use :code:`docker run mythril/myth` the same way you would use the :code:`myth`
    .. code-block:: bash
 
       docker run mythril/myth --help
-      docker run mythril/myth -dc "0x6060"
+      docker run mythril/myth disassemble -c "0x6060"
 
 To pass a file from your host machine to the dockerized Mythril, you must mount its containing folder to the container properly. For :code:`contract.sol` in the current working directory, do:
 
    .. code-block:: bash
 
-      docker run -v $(pwd):/tmp mythril/myth -x /tmp/contract.sol
+      docker run -v $(pwd):/tmp mythril/myth analyze /tmp/contract.sol
diff --git a/docs/source/security-analysis.rst b/docs/source/security-analysis.rst
index 4cd1010e..2e276f70 100644
--- a/docs/source/security-analysis.rst
+++ b/docs/source/security-analysis.rst
@@ -11,7 +11,7 @@ In order to work with Solidity source code files, the `solc command line compile
 
 .. code-block:: bash
 
-   $ myth -x ether_send.sol
+   $ myth analyze ether_send.sol
    ==== Unprotected Ether Withdrawal ====
    SWC ID: 105
    Severity: High
@@ -32,7 +32,7 @@ If an input file contains multiple contract definitions, Mythril analyzes the *l
 
 .. code-block:: bash
 
-   myth -x OmiseGo.sol:OMGToken
+   myth analyze OmiseGo.sol:OMGToken
 
 Specifying Solc Versions
 ########################
@@ -47,7 +47,7 @@ By default, analysis results are printed to the terminal in text format. You can
 
 .. code-block:: bash
 
-   myth -xo jsonv2 underflow.sol
+   myth analyze underflow.sol -o jsonv2
 
 Available formats are :code:`text`, :code:`markdown`, :code:`json`, and :code:`jsonv2`. For integration with other tools, :code:`jsonv2` is generally preferred over :code:`json` because it is consistent with other `MythX <https://mythx.io>`_ tools.
 
@@ -73,13 +73,13 @@ Analyze mainnet contract via INFURA:
 
 .. code-block:: bash
 
-   myth -x -a 0x5c436ff914c458983414019195e0f4ecbef9e6dd
+   myth analyze -a 0x5c436ff914c458983414019195e0f4ecbef9e6dd
 
 Adding the :code:`-l` flag will cause mythril to automatically retrieve dependencies, such as dynamically linked library contracts:
 
 .. code-block:: bash
 
-   myth -xla 0xEbFD99838cb0c132016B9E117563CB41f2B02264 -v4
+   myth -v4 analyze -l -a 0xEbFD99838cb0c132016B9E117563CB41f2B02264
 
 ******************
 Speed vs. Coverage
diff --git a/myth b/myth
index a45d431f..f378aba7 100755
--- a/myth
+++ b/myth
@@ -3,7 +3,25 @@
 """mythril.py: Bug hunting on the Ethereum blockchain
    http://www.github.com/b-mueller/mythril
    """
+from sys import argv, exit
+from mythril.interfaces.cli import COMMAND_LIST
 import mythril.interfaces.cli
+import mythril.interfaces.old_cli
+import warnings
+
+
+def format_Warning(message, category, filename, lineno, line=""):
+    return "Deprecated Warning: {}\n\n".format(str(message))
+
+
+warnings.formatwarning = format_Warning
 
 if __name__ == "__main__":
-    mythril.interfaces.cli.main()
+    for arg in argv:
+        if arg in COMMAND_LIST:
+            mythril.interfaces.cli.main()
+            exit()
+    warnings.warn("The old cli arguments are deprecated, Please use 'myth -h' to view the new command line interface")
+    mythril.interfaces.old_cli.main()
+
+
diff --git a/mythril/interfaces/old_cli.py b/mythril/interfaces/old_cli.py
new file mode 100644
index 00000000..4c9d4222
--- /dev/null
+++ b/mythril/interfaces/old_cli.py
@@ -0,0 +1,549 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""mythril.py: Bug hunting on the Ethereum blockchain
+
+   http://www.github.com/ConsenSys/mythril
+"""
+
+import argparse
+import json
+import logging
+import os
+import sys
+
+import coloredlogs
+import traceback
+
+import mythril.support.signatures as sigs
+from mythril.exceptions import AddressNotFoundError, CriticalError
+from mythril.mythril import (
+    MythrilAnalyzer,
+    MythrilDisassembler,
+    MythrilConfig,
+    MythrilLevelDB,
+)
+from mythril.__version__ import __version__ as VERSION
+
+log = logging.getLogger(__name__)
+
+
+def exit_with_error(format_, message):
+    """
+    :param format_:
+    :param message:
+    """
+    if format_ == "text" or format_ == "markdown":
+        log.error(message)
+    elif format_ == "json":
+        result = {"success": False, "error": str(message), "issues": []}
+        print(json.dumps(result))
+    else:
+        result = [
+            {
+                "issues": [],
+                "sourceType": "",
+                "sourceFormat": "",
+                "sourceList": [],
+                "meta": {
+                    "logs": [{"level": "error", "hidden": "true", "msg": message}]
+                },
+            }
+        ]
+        print(json.dumps(result))
+    sys.exit()
+
+
+def main() -> None:
+    """The main CLI interface entry point."""
+    parser = argparse.ArgumentParser(
+        description="Security analysis of Ethereum smart contracts"
+    )
+    create_parser(parser)
+
+    # Get config values
+
+    args = parser.parse_args()
+    parse_args(parser=parser, args=args)
+
+
+def create_parser(parser: argparse.ArgumentParser) -> None:
+    """
+    Creates the parser by setting all the possible arguments
+    :param parser: The parser
+    """
+    parser.add_argument("solidity_file", nargs="*")
+
+    commands = parser.add_argument_group("commands")
+    commands.add_argument("-g", "--graph", help="generate a control flow graph")
+    commands.add_argument(
+        "-V",
+        "--version",
+        action="store_true",
+        help="print the Mythril version number and exit",
+    )
+    commands.add_argument(
+        "-x",
+        "--fire-lasers",
+        action="store_true",
+        help="detect vulnerabilities, use with -c, -a or solidity file(s)",
+    )
+    commands.add_argument(
+        "--truffle",
+        action="store_true",
+        help="analyze a truffle project (run from project dir)",
+    )
+    commands.add_argument(
+        "-d", "--disassemble", action="store_true", help="print disassembly"
+    )
+    commands.add_argument(
+        "-j",
+        "--statespace-json",
+        help="dumps the statespace json",
+        metavar="OUTPUT_FILE",
+    )
+
+    inputs = parser.add_argument_group("input arguments")
+    inputs.add_argument(
+        "-c",
+        "--code",
+        help='hex-encoded bytecode string ("6060604052...")',
+        metavar="BYTECODE",
+    )
+    inputs.add_argument(
+        "-f",
+        "--codefile",
+        help="file containing hex-encoded bytecode string",
+        metavar="BYTECODEFILE",
+        type=argparse.FileType("r"),
+    )
+    inputs.add_argument(
+        "-a",
+        "--address",
+        help="pull contract from the blockchain",
+        metavar="CONTRACT_ADDRESS",
+    )
+    inputs.add_argument(
+        "-l",
+        "--dynld",
+        action="store_true",
+        help="auto-load dependencies from the blockchain",
+    )
+    inputs.add_argument(
+        "--no-onchain-storage-access",
+        action="store_true",
+        help="turns off getting the data from onchain contracts",
+    )
+    inputs.add_argument(
+        "--bin-runtime",
+        action="store_true",
+        help="Only when -c or -f is used. Consider the input bytecode as binary runtime code, default being the contract creation bytecode.",
+    )
+
+    outputs = parser.add_argument_group("output formats")
+    outputs.add_argument(
+        "-o",
+        "--outform",
+        choices=["text", "markdown", "json", "jsonv2"],
+        default="text",
+        help="report output format",
+        metavar="<text/markdown/json/jsonv2>",
+    )
+    outputs.add_argument(
+        "--verbose-report",
+        action="store_true",
+        help="Include debugging information in report",
+    )
+
+    database = parser.add_argument_group("local contracts database")
+    database.add_argument(
+        "-s", "--search", help="search the contract database", metavar="EXPRESSION"
+    )
+    database.add_argument(
+        "--leveldb-dir",
+        help="specify leveldb directory for search or direct access operations",
+        metavar="LEVELDB_PATH",
+    )
+
+    utilities = parser.add_argument_group("utilities")
+    utilities.add_argument(
+        "--hash", help="calculate function signature hash", metavar="SIGNATURE"
+    )
+    utilities.add_argument(
+        "--storage",
+        help="read state variables from storage index, use with -a",
+        metavar="INDEX,NUM_SLOTS,[array] / mapping,INDEX,[KEY1, KEY2...]",
+    )
+    utilities.add_argument(
+        "--solv",
+        help="specify solidity compiler version. If not present, will try to install it (Experimental)",
+        metavar="SOLV",
+    )
+    utilities.add_argument(
+        "--contract-hash-to-address",
+        help="returns corresponding address for a contract address hash",
+        metavar="SHA3_TO_LOOK_FOR",
+    )
+
+    options = parser.add_argument_group("options")
+    options.add_argument(
+        "-m",
+        "--modules",
+        help="Comma-separated list of security analysis modules",
+        metavar="MODULES",
+    )
+    options.add_argument(
+        "--max-depth",
+        type=int,
+        default=50,
+        help="Maximum recursion depth for symbolic execution",
+    )
+    options.add_argument(
+        "--strategy",
+        choices=["dfs", "bfs", "naive-random", "weighted-random"],
+        default="bfs",
+        help="Symbolic execution strategy",
+    )
+    options.add_argument(
+        "-b",
+        "--loop-bound",
+        type=int,
+        default=4,
+        help="Bound loops at n iterations",
+        metavar="N",
+    )
+    options.add_argument(
+        "-t",
+        "--transaction-count",
+        type=int,
+        default=2,
+        help="Maximum number of transactions issued by laser",
+    )
+    options.add_argument(
+        "--execution-timeout",
+        type=int,
+        default=86400,
+        help="The amount of seconds to spend on symbolic execution",
+    )
+    options.add_argument(
+        "--create-timeout",
+        type=int,
+        default=10,
+        help="The amount of seconds to spend on " "the initial contract creation",
+    )
+    options.add_argument("--solc-args", help="Extra arguments for solc")
+    options.add_argument(
+        "--phrack", action="store_true", help="Phrack-style call graph"
+    )
+    options.add_argument(
+        "--enable-physics", action="store_true", help="enable graph physics simulation"
+    )
+    options.add_argument(
+        "-v", type=int, help="log level (0-5)", metavar="LOG_LEVEL", default=2
+    )
+    options.add_argument(
+        "-q",
+        "--query-signature",
+        action="store_true",
+        help="Lookup function signatures through www.4byte.directory",
+    )
+    options.add_argument(
+        "--enable-iprof", action="store_true", help="enable the instruction profiler"
+    )
+    options.add_argument(
+        "--disable-dependency-pruning",
+        action="store_true",
+        help="Deactivate dependency-based pruning",
+    )
+
+    rpc = parser.add_argument_group("RPC options")
+
+    rpc.add_argument(
+        "--rpc",
+        help="custom RPC settings",
+        metavar="HOST:PORT / ganache / infura-[network_name]",
+        default="infura-mainnet",
+    )
+    rpc.add_argument(
+        "--rpctls", type=bool, default=False, help="RPC connection over TLS"
+    )
+    parser.add_argument("--epic", action="store_true", help=argparse.SUPPRESS)
+
+
+def validate_args(parser: argparse.ArgumentParser, args: argparse.Namespace):
+    if not (
+        args.search
+        or args.hash
+        or args.disassemble
+        or args.graph
+        or args.fire_lasers
+        or args.storage
+        or args.truffle
+        or args.statespace_json
+        or args.contract_hash_to_address
+    ):
+        parser.print_help()
+        sys.exit()
+
+    if args.v:
+        if 0 <= args.v < 6:
+            log_levels = [
+                logging.NOTSET,
+                logging.CRITICAL,
+                logging.ERROR,
+                logging.WARNING,
+                logging.INFO,
+                logging.DEBUG,
+            ]
+            coloredlogs.install(
+                fmt="%(name)s [%(levelname)s]: %(message)s", level=log_levels[args.v]
+            )
+            logging.getLogger("mythril").setLevel(log_levels[args.v])
+        else:
+            exit_with_error(
+                args.outform, "Invalid -v value, you can find valid values in usage"
+            )
+
+    if args.query_signature:
+        if sigs.ethereum_input_decoder is None:
+            exit_with_error(
+                args.outform,
+                "The --query-signature function requires the python package ethereum-input-decoder",
+            )
+
+    if args.enable_iprof:
+        if args.v < 4:
+            exit_with_error(
+                args.outform,
+                "--enable-iprof must be used with -v LOG_LEVEL where LOG_LEVEL >= 4",
+            )
+        elif not (args.graph or args.fire_lasers or args.statespace_json):
+            exit_with_error(
+                args.outform,
+                "--enable-iprof must be used with one of -g, --graph, -x, --fire-lasers, -j and --statespace-json",
+            )
+
+
+def quick_commands(args: argparse.Namespace):
+    if args.hash:
+        print(MythrilDisassembler.hash_for_function_signature(args.hash))
+        sys.exit()
+
+
+def set_config(args: argparse.Namespace):
+    config = MythrilConfig()
+    if args.dynld or not args.no_onchain_storage_access and not (args.rpc or args.i):
+        config.set_api_from_config_path()
+
+    if args.address:
+        # Establish RPC connection if necessary
+        config.set_api_rpc(rpc=args.rpc, rpctls=args.rpctls)
+    elif args.search or args.contract_hash_to_address:
+        # Open LevelDB if necessary
+        config.set_api_leveldb(
+            config.leveldb_dir if not args.leveldb_dir else args.leveldb_dir
+        )
+    return config
+
+
+def leveldb_search(config: MythrilConfig, args: argparse.Namespace):
+    if args.search or args.contract_hash_to_address:
+        leveldb_searcher = MythrilLevelDB(config.eth_db)
+        if args.search:
+            # Database search ops
+            leveldb_searcher.search_db(args.search)
+
+        else:
+            # search corresponding address
+            try:
+                leveldb_searcher.contract_hash_to_address(args.contract_hash_to_address)
+            except AddressNotFoundError:
+                print("Address not found.")
+
+        sys.exit()
+
+
+def get_code(disassembler: MythrilDisassembler, args: argparse.Namespace):
+    address = None
+    if args.code:
+        # Load from bytecode
+        code = args.code[2:] if args.code.startswith("0x") else args.code
+        address, _ = disassembler.load_from_bytecode(code, args.bin_runtime)
+    elif args.codefile:
+        bytecode = "".join([l.strip() for l in args.codefile if len(l.strip()) > 0])
+        bytecode = bytecode[2:] if bytecode.startswith("0x") else bytecode
+        address, _ = disassembler.load_from_bytecode(bytecode, args.bin_runtime)
+    elif args.address:
+        # Get bytecode from a contract address
+        address, _ = disassembler.load_from_address(args.address)
+    elif args.solidity_file:
+        # Compile Solidity source file(s)
+        if args.graph and len(args.solidity_file) > 1:
+            exit_with_error(
+                args.outform,
+                "Cannot generate call graphs from multiple input files. Please do it one at a time.",
+            )
+        address, _ = disassembler.load_from_solidity(
+            args.solidity_file
+        )  # list of files
+    else:
+        exit_with_error(
+            args.outform,
+            "No input bytecode. Please provide EVM code via -c BYTECODE, -a ADDRESS, or -i SOLIDITY_FILES",
+        )
+    return address
+
+
+def execute_command(
+    disassembler: MythrilDisassembler,
+    address: str,
+    parser: argparse.ArgumentParser,
+    args: argparse.Namespace,
+):
+
+    if args.storage:
+        if not args.address:
+            exit_with_error(
+                args.outform,
+                "To read storage, provide the address of a deployed contract with the -a option.",
+            )
+
+        storage = disassembler.get_state_variable_from_storage(
+            address=address, params=[a.strip() for a in args.storage.strip().split(",")]
+        )
+        print(storage)
+        return
+
+    analyzer = MythrilAnalyzer(
+        strategy=args.strategy,
+        disassembler=disassembler,
+        address=address,
+        max_depth=args.max_depth,
+        execution_timeout=args.execution_timeout,
+        loop_bound=args.loop_bound,
+        create_timeout=args.create_timeout,
+        enable_iprof=args.enable_iprof,
+        disable_dependency_pruning=args.disable_dependency_pruning,
+        onchain_storage_access=not args.no_onchain_storage_access,
+    )
+
+    if args.disassemble:
+        # or mythril.disassemble(mythril.contracts[0])
+
+        if disassembler.contracts[0].code:
+            print("Runtime Disassembly: \n" + disassembler.contracts[0].get_easm())
+        if disassembler.contracts[0].creation_code:
+            print("Disassembly: \n" + disassembler.contracts[0].get_creation_easm())
+
+    elif args.graph or args.fire_lasers:
+        if not disassembler.contracts:
+            exit_with_error(
+                args.outform, "input files do not contain any valid contracts"
+            )
+
+        if args.graph:
+            html = analyzer.graph_html(
+                contract=analyzer.contracts[0],
+                enable_physics=args.enable_physics,
+                phrackify=args.phrack,
+                transaction_count=args.transaction_count,
+            )
+
+            try:
+                with open(args.graph, "w") as f:
+                    f.write(html)
+            except Exception as e:
+                exit_with_error(args.outform, "Error saving graph: " + str(e))
+
+        else:
+            try:
+                report = analyzer.fire_lasers(
+                    modules=[m.strip() for m in args.modules.strip().split(",")]
+                    if args.modules
+                    else [],
+                    verbose_report=args.verbose_report,
+                    transaction_count=args.transaction_count,
+                )
+                outputs = {
+                    "json": report.as_json(),
+                    "jsonv2": report.as_swc_standard_format(),
+                    "text": report.as_text(),
+                    "markdown": report.as_markdown(),
+                }
+                print(outputs[args.outform])
+            except ModuleNotFoundError as e:
+                exit_with_error(
+                    args.outform, "Error loading analyis modules: " + format(e)
+                )
+
+    elif args.statespace_json:
+
+        if not analyzer.contracts:
+            exit_with_error(
+                args.outform, "input files do not contain any valid contracts"
+            )
+
+        statespace = analyzer.dump_statespace(contract=analyzer.contracts[0])
+
+        try:
+            with open(args.statespace_json, "w") as f:
+                json.dump(statespace, f)
+        except Exception as e:
+            exit_with_error(args.outform, "Error saving json: " + str(e))
+
+    else:
+        parser.print_help()
+
+
+def parse_args(parser: argparse.ArgumentParser, args: argparse.Namespace) -> None:
+    """
+    Parses the arguments
+    :param parser: The parser
+    :param args: The args
+    """
+
+    if args.epic:
+        path = os.path.dirname(os.path.realpath(__file__))
+        sys.argv.remove("--epic")
+        os.system(" ".join(sys.argv) + " | python3 " + path + "/epic.py")
+        sys.exit()
+
+    if args.version:
+        if args.outform == "json":
+            print(json.dumps({"version_str": VERSION}))
+        else:
+            print("Mythril version {}".format(VERSION))
+        sys.exit()
+
+    # Parse cmdline args
+    validate_args(parser, args)
+    try:
+        quick_commands(args)
+        config = set_config(args)
+        leveldb_search(config, args)
+        disassembler = MythrilDisassembler(
+            eth=config.eth,
+            solc_version=args.solv,
+            solc_args=args.solc_args,
+            enable_online_lookup=args.query_signature,
+        )
+        if args.truffle:
+            try:
+                disassembler.analyze_truffle_project(args)
+            except FileNotFoundError:
+                print(
+                    "Build directory not found. Make sure that you start the analysis from the project root, and that 'truffle compile' has executed successfully."
+                )
+            sys.exit()
+
+        address = get_code(disassembler, args)
+        execute_command(
+            disassembler=disassembler, address=address, parser=parser, args=args
+        )
+    except CriticalError as ce:
+        exit_with_error(args.outform, str(ce))
+    except Exception:
+        exit_with_error(args.outform, traceback.format_exc())
+
+
+if __name__ == "__main__":
+    main()