diff --git a/parsetab/tabs.dbm.bak b/parsetab/tabs.dbm.bak
index 663d8c7b8..7621be515 100644
--- a/parsetab/tabs.dbm.bak
+++ b/parsetab/tabs.dbm.bak
@@ -1,4 +1,4 @@
-'zxbppparse', (0, 69188)
+'zxbppparse', (0, 69185)
 'asmparse', (69632, 250690)
 'zxnext_asmparse', (320512, 281648)
-'zxbparser', (602624, 707013)
+'zxbparser', (602624, 707985)
diff --git a/parsetab/tabs.dbm.dat b/parsetab/tabs.dbm.dat
index 44c580766..fffc532fb 100644
Binary files a/parsetab/tabs.dbm.dat and b/parsetab/tabs.dbm.dat differ
diff --git a/parsetab/tabs.dbm.dir b/parsetab/tabs.dbm.dir
index 663d8c7b8..7621be515 100644
--- a/parsetab/tabs.dbm.dir
+++ b/parsetab/tabs.dbm.dir
@@ -1,4 +1,4 @@
-'zxbppparse', (0, 69188)
+'zxbppparse', (0, 69185)
 'asmparse', (69632, 250690)
 'zxnext_asmparse', (320512, 281648)
-'zxbparser', (602624, 707013)
+'zxbparser', (602624, 707985)
diff --git a/setup.py b/setup.py
index 7d3bae5be..cb36cb7a0 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import find_packages
 from collections import defaultdict
 
-import version
+from zxb import version
 
 
 def get_files(folders):
diff --git a/tests/cmdline/test_zxb.py b/tests/cmdline/test_zxb.py
index e57935f0a..c222e4c20 100644
--- a/tests/cmdline/test_zxb.py
+++ b/tests/cmdline/test_zxb.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-import zxb
+from zxb import zxb
 import os
 
 PATH = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
diff --git a/zxb.py b/zxb.py
index 0f8d4b5a1..e5fe559a2 100755
--- a/zxb.py
+++ b/zxb.py
@@ -2,368 +2,9 @@
 # -*- coding: utf-8 -*-
 # vim: ts=4:sw=4:et:
 
-from version import VERSION
-
 import sys
-import os
-import re
-import argparse
-
-from io import StringIO
-
-import api.debug
-import api.config
-import api.optimize
-from api.utils import open_file
-
-import zxblex
-import zxbparser
-from zxbpp import zxbpp
-from zxbasm import asmparse
-import arch.zx48k.backend as backend
-
-from api import global_ as gl
-from api.config import OPTIONS
-from api import debug
-from arch.zx48k.optimizer import optimize
-
-import arch
-
-
-def get_inits(memory):
-    backend.INITS.union(zxbparser.INITS)
-
-    reinit = re.compile(r'^#[ \t]*init[ \t]+([_a-zA-Z][_a-zA-Z0-9]*)[ \t]*$',
-                        re.IGNORECASE)
-
-    i = 0
-    for m in memory:
-        init = reinit.match(m)
-        if init is not None:
-            backend.INITS.add(init.groups()[0])
-            memory[i] = ''
-        i += 1
-
-
-def output(memory, ofile=None):
-    """ Filters the output removing useless preprocessor #directives
-    and writes it to the given file or to the screen if no file is passed
-    """
-    for m in memory:
-        m = m.rstrip('\r\n\t ')  # Ensures no trailing newlines (might with upon includes)
-        if m and m[0] == '#':  # Preprocessor directive?
-            if ofile is None:
-                print(m)
-            else:
-                ofile.write('%s\n' % m)
-            continue
-
-        # Prints a 4 spaces "tab" for non labels
-        if m and ':' not in m:
-            if ofile is None:
-                print('    '),
-            else:
-                ofile.write('\t')
-
-        if ofile is None:
-            print(m)
-        else:
-            ofile.write('%s\n' % m)
-
-
-def main(args=None):
-    """ Entry point when executed from command line.
-    You can use zxb.py as a module with import, and this
-    function won't be executed.
-    """
-    api.config.init()
-    zxbpp.init()
-    zxbparser.init()
-    arch.zx48k.backend.init()
-    arch.zx48k.Translator.reset()
-    asmparse.init()
-
-    # ------------------------------------------------------------
-    # Command line parsing
-    # ------------------------------------------------------------
-    parser = argparse.ArgumentParser(prog='zxb')
-    parser.add_argument('PROGRAM', type=str,
-                        help='BASIC program file')
-    parser.add_argument('-d', '--debug', dest='debug', default=OPTIONS.Debug.value, action='count',
-                        help='Enable verbosity/debugging output. Additional -d increase verbosity/debug level')
-    parser.add_argument('-O', '--optimize', type=int, default=OPTIONS.optimization.value,
-                        help='Sets optimization level. '
-                             '0 = None (default level is {0})'.format(OPTIONS.optimization.value))
-    parser.add_argument('-o', '--output', type=str, dest='output_file', default=None,
-                        help='Sets output file. Default is input filename with .bin extension')
-    parser.add_argument('-T', '--tzx', action='store_true',
-                        help="Sets output format to tzx (default is .bin)")
-    parser.add_argument('-t', '--tap', action='store_true',
-                        help="Sets output format to tap (default is .bin)")
-    parser.add_argument('-B', '--BASIC', action='store_true', dest='basic',
-                        help="Creates a BASIC loader which loads the rest of the CODE. Requires -T ot -t")
-    parser.add_argument('-a', '--autorun', action='store_true',
-                        help="Sets the program to be run once loaded")
-    parser.add_argument('-A', '--asm', action='store_true',
-                        help="Sets output format to asm")
-    parser.add_argument('-S', '--org', type=str, default=str(OPTIONS.org.value),
-                        help="Start of machine code. By default %i" % OPTIONS.org.value)
-    parser.add_argument('-e', '--errmsg', type=str, dest='stderr', default=OPTIONS.StdErrFileName.value,
-                        help='Error messages file (standard error console by default)')
-    parser.add_argument('--array-base', type=int, default=OPTIONS.array_base.value,
-                        help='Default lower index for arrays ({0} by default)'.format(OPTIONS.array_base.value))
-    parser.add_argument('--string-base', type=int, default=OPTIONS.string_base.value,
-                        help='Default lower index for strings ({0} by default)'.format(OPTIONS.array_base.value))
-    parser.add_argument('-Z', '--sinclair', action='store_true',
-                        help='Enable by default some more original ZX Spectrum Sinclair BASIC features: ATTR, SCREEN$, '
-                             'POINT')
-    parser.add_argument('-H', '--heap-size', type=int, default=OPTIONS.heap_size.value,
-                        help='Sets heap size in bytes (default {0} bytes)'.format(OPTIONS.heap_size.value))
-    parser.add_argument('--debug-memory', action='store_true',
-                        help='Enables out-of-memory debug')
-    parser.add_argument('--debug-array', action='store_true',
-                        help='Enables array boundary checking')
-    parser.add_argument('--strict-bool', action='store_true',
-                        help='Enforce boolean values to be 0 or 1')
-    parser.add_argument('--enable-break', action='store_true',
-                        help='Enables program execution BREAK detection')
-    parser.add_argument('-E', '--emit-backend', action='store_true',
-                        help='Emits backend code instead of ASM or binary')
-    parser.add_argument('--explicit', action='store_true',
-                        help='Requires all variables and functions to be declared before used')
-    parser.add_argument('-D', '--define', type=str, dest='defines', action='append',
-                        help='Defines de given macro. Eg. -D MYDEBUG or -D NAME=Value')
-    parser.add_argument('-M', '--mmap', type=str, dest='memory_map', default=None,
-                        help='Generate label memory map')
-    parser.add_argument('-i', '--ignore-case', action='store_true',
-                        help='Ignore case. Makes variable names are case insensitive')
-    parser.add_argument('-I', '--include-path', type=str, default='',
-                        help='Add colon separated list of directories to add to include path. e.g. -I dir1:dir2')
-    parser.add_argument('--strict', action='store_true',
-                        help='Enables strict mode. Force explicit type declaration')
-    parser.add_argument('--headerless', action='store_true',
-                        help='Header-less mode: omit asm prologue and epilogue')
-    parser.add_argument('--version', action='version', version='%(prog)s {0}'.format(VERSION))
-    parser.add_argument('--parse-only', action='store_true',
-                        help='Only parses to check for syntax and semantic errors')
-    parser.add_argument('--append-binary', default=[], action='append',
-                        help='Appends binary to tape file (only works with -t or -T)')
-    parser.add_argument('--append-headless-binary', default=[], action='append',
-                        help='Appends binary to tape file (only works with -t or -T)')
-    parser.add_argument('-N', '--zxnext', action='store_true',
-                        help='Enables ZX Next asm extended opcodes')
-
-    options = parser.parse_args(args=args)
-
-    # ------------------------------------------------------------
-    # Setting of internal parameters according to command line
-    # ------------------------------------------------------------
-
-    OPTIONS.Debug.value = options.debug
-    OPTIONS.optimization.value = options.optimize
-    OPTIONS.outputFileName.value = options.output_file
-    OPTIONS.StdErrFileName.value = options.stderr
-    OPTIONS.array_base.value = options.array_base
-    OPTIONS.string_base.value = options.string_base
-    OPTIONS.Sinclair.value = options.sinclair
-    OPTIONS.heap_size.value = options.heap_size
-    OPTIONS.memoryCheck.value = options.debug_memory
-    OPTIONS.strictBool.value = options.strict_bool or OPTIONS.Sinclair.value
-    OPTIONS.arrayCheck.value = options.debug_array
-    OPTIONS.emitBackend.value = options.emit_backend
-    OPTIONS.enableBreak.value = options.enable_break
-    OPTIONS.explicit.value = options.explicit
-    OPTIONS.memory_map.value = options.memory_map
-    OPTIONS.strict.value = options.strict
-    OPTIONS.headerless.value = options.headerless
-    OPTIONS.zxnext.value = options.zxnext
-
-    OPTIONS.org.value = api.utils.parse_int(options.org)
-    if OPTIONS.org.value is None:
-        parser.error("Invalid --org option '{}'".format(options.org))
-
-    if options.defines:
-        for i in options.defines:
-            macro = list(i.split('=', 1))
-            name = macro[0]
-            val = ''.join(macro[1:])
-            OPTIONS.__DEFINES.value[name] = val
-            zxbpp.ID_TABLE.define(name, lineno=0)
-
-    if OPTIONS.Sinclair.value:
-        OPTIONS.array_base.value = 1
-        OPTIONS.string_base.value = 1
-        OPTIONS.strictBool.value = True
-        OPTIONS.case_insensitive.value = True
-
-    if options.ignore_case:
-        OPTIONS.case_insensitive.value = True
-
-    debug.ENABLED = OPTIONS.Debug.value
-
-    if int(options.tzx) + int(options.tap) + int(options.asm) + int(options.emit_backend) + \
-            int(options.parse_only) > 1:
-        parser.error("Options --tap, --tzx, --emit-backend, --parse-only and --asm are mutually exclusive")
-        return 3
-
-    if options.basic and not options.tzx and not options.tap:
-        parser.error('Option --BASIC and --autorun requires --tzx or tap format')
-        return 4
-
-    if options.append_binary and not options.tzx and not options.tap:
-        parser.error('Option --append-binary needs either --tap or --tzx')
-        return 5
-
-    if options.asm and options.memory_map:
-        parser.error('Option --asm and --mmap cannot be used together')
-        return 6
-
-    OPTIONS.use_loader.value = options.basic
-    OPTIONS.autorun.value = options.autorun
-
-    if options.tzx:
-        OPTIONS.output_file_type.value = 'tzx'
-    elif options.tap:
-        OPTIONS.output_file_type.value = 'tap'
-    elif options.asm:
-        OPTIONS.output_file_type.value = 'asm'
-    elif options.emit_backend:
-        OPTIONS.output_file_type.value = 'ic'
-
-    args = [options.PROGRAM]
-    if not os.path.exists(options.PROGRAM):
-        parser.error("No such file or directory: '%s'" % args[0])
-        return 2
-
-    if OPTIONS.memoryCheck.value:
-        OPTIONS.__DEFINES.value['__MEMORY_CHECK__'] = ''
-        zxbpp.ID_TABLE.define('__MEMORY_CHECK__', lineno=0)
-
-    if OPTIONS.arrayCheck.value:
-        OPTIONS.__DEFINES.value['__CHECK_ARRAY_BOUNDARY__'] = ''
-        zxbpp.ID_TABLE.define('__CHECK_ARRAY_BOUNDARY__', lineno=0)
-
-    if OPTIONS.enableBreak.value:
-        OPTIONS.__DEFINES.value['__ENABLE_BREAK__'] = ''
-        zxbpp.ID_TABLE.define('__ENABLE_BREAK__', lineno=0)
-
-    OPTIONS.include_path.value = options.include_path
-    OPTIONS.inputFileName.value = zxbparser.FILENAME = \
-        os.path.basename(args[0])
-
-    if not OPTIONS.outputFileName.value:
-        OPTIONS.outputFileName.value = \
-            os.path.splitext(os.path.basename(OPTIONS.inputFileName.value))[0] + os.path.extsep + \
-            OPTIONS.output_file_type.value
-
-    if OPTIONS.StdErrFileName.value:
-        OPTIONS.stderr.value = open_file(OPTIONS.StdErrFileName.value, 'wt', 'utf-8')
-
-    zxbpp.setMode('basic')
-    zxbpp.main(args)
-
-    if gl.has_errors:
-        debug.__DEBUG__("exiting due to errors.")
-        return 1  # Exit with errors
-
-    input_ = zxbpp.OUTPUT
-    zxbparser.parser.parse(input_, lexer=zxblex.lexer, tracking=True,
-                           debug=(OPTIONS.Debug.value > 2))
-    if gl.has_errors:
-        debug.__DEBUG__("exiting due to errors.")
-        return 1  # Exit with errors
-
-    # Optimizations
-    optimizer = api.optimize.OptimizerVisitor()
-    optimizer.visit(zxbparser.ast)
-
-    # Emits intermediate code
-    translator = arch.zx48k.Translator()
-    translator.visit(zxbparser.ast)
-
-    if gl.DATA_IS_USED:
-        gl.FUNCTIONS.extend(gl.DATA_FUNCTIONS)
-
-    # This will fill MEMORY with pending functions
-    func_visitor = arch.zx48k.FunctionTranslator(gl.FUNCTIONS)
-    func_visitor.start()
-
-    # Emits data lines
-    translator.emit_data_blocks()
-    # Emits default constant strings
-    translator.emit_strings()
-    # Emits jump tables
-    translator.emit_jump_tables()
-
-    if OPTIONS.emitBackend.value:
-        with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:
-            for quad in translator.dumpMemory(backend.MEMORY):
-                output_file.write(str(quad) + '\n')
-
-            backend.MEMORY[:] = []  # Empties memory
-            # This will fill MEMORY with global declared variables
-            translator = arch.zx48k.VarTranslator()
-            translator.visit(zxbparser.data_ast)
-
-            for quad in translator.dumpMemory(backend.MEMORY):
-                output_file.write(str(quad) + '\n')
-        return 0  # Exit success
-
-    # Join all lines into a single string and ensures an INTRO at end of file
-    asm_output = backend.emit(backend.MEMORY, optimize=OPTIONS.optimization.value > 0)
-    asm_output = optimize(asm_output) + '\n'  # invoke the -O3
-
-    asm_output = asm_output.split('\n')
-    for i in range(len(asm_output)):
-        tmp = backend.ASMS.get(asm_output[i], None)
-        if tmp is not None:
-            asm_output[i] = '\n'.join(tmp)
-
-    asm_output = '\n'.join(asm_output)
-
-    # Now filter them against the preprocessor again
-    zxbpp.setMode('asm')
-    zxbpp.OUTPUT = ''
-    zxbpp.filter_(asm_output, args[0])
-
-    # Now output the result
-    asm_output = zxbpp.OUTPUT.split('\n')
-    get_inits(asm_output)  # Find out remaining inits
-    backend.MEMORY[:] = []
-
-    # This will fill MEMORY with global declared variables
-    translator = arch.zx48k.VarTranslator()
-    translator.visit(zxbparser.data_ast)
-    if gl.has_errors:
-        debug.__DEBUG__("exiting due to errors.")
-        return 1  # Exit with errors
-
-    tmp = [x for x in backend.emit(backend.MEMORY, optimize=False) if x.strip()[0] != '#']
-    asm_output += tmp
-    asm_output = backend.emit_start() + asm_output
-    asm_output += backend.emit_end()
-
-    if options.asm:  # Only output assembler file
-        with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:
-            output(asm_output, output_file)
-    elif not options.parse_only:
-        fout = StringIO()
-        output(asm_output, fout)
-        asmparse.assemble(fout.getvalue())
-        fout.close()
-        asmparse.generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type.value,
-                                 binary_files=options.append_binary,
-                                 headless_binary_files=options.append_headless_binary)
-        if gl.has_errors:
-            return 5  # Error in assembly
-
-    if OPTIONS.memory_map.value:
-        if asmparse.MEMORY is not None:
-            with open_file(OPTIONS.memory_map.value, 'wt', 'utf-8') as f:
-                f.write(asmparse.MEMORY.memory_map)
-
-    return gl.has_errors  # Exit success
 
+import zxb
 
 if __name__ == '__main__':
-    sys.exit(main())  # Exit
+    sys.exit(zxb.main())  # Exit
diff --git a/zxb/__init__.py b/zxb/__init__.py
new file mode 100644
index 000000000..f00018858
--- /dev/null
+++ b/zxb/__init__.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim: ts=4:et:sw=4:
+
+# ----------------------------------------------------------------------
+# Copyleft (K), Jose M. Rodriguez-Rosa (a.k.a. Boriel)
+#
+# This program is Free Software and is released under the terms of
+#                    the GNU General License
+# ----------------------------------------------------------------------
+
+from .zxb import main  # noqa
diff --git a/version.py b/zxb/version.py
similarity index 100%
rename from version.py
rename to zxb/version.py
diff --git a/zxb/zxb.py b/zxb/zxb.py
new file mode 100755
index 000000000..ee5cb4927
--- /dev/null
+++ b/zxb/zxb.py
@@ -0,0 +1,368 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim: ts=4:sw=4:et:
+
+import sys
+import os
+import re
+import argparse
+
+from io import StringIO
+
+import api.debug
+import api.config
+import api.optimize
+from api.utils import open_file
+
+from .version import VERSION
+
+from . import zxbparser, zxblex
+from zxbpp import zxbpp
+from zxbasm import asmparse
+import arch.zx48k.backend as backend
+
+from api import global_ as gl
+from api.config import OPTIONS
+from api import debug
+from arch.zx48k.optimizer import optimize
+
+import arch
+
+
+def get_inits(memory):
+    backend.INITS.union(zxbparser.INITS)
+
+    reinit = re.compile(r'^#[ \t]*init[ \t]+([_a-zA-Z][_a-zA-Z0-9]*)[ \t]*$',
+                        re.IGNORECASE)
+
+    i = 0
+    for m in memory:
+        init = reinit.match(m)
+        if init is not None:
+            backend.INITS.add(init.groups()[0])
+            memory[i] = ''
+        i += 1
+
+
+def output(memory, ofile=None):
+    """ Filters the output removing useless preprocessor #directives
+    and writes it to the given file or to the screen if no file is passed
+    """
+    for m in memory:
+        m = m.rstrip('\r\n\t ')  # Ensures no trailing newlines (might with upon includes)
+        if m and m[0] == '#':  # Preprocessor directive?
+            if ofile is None:
+                print(m)
+            else:
+                ofile.write('%s\n' % m)
+            continue
+
+        # Prints a 4 spaces "tab" for non labels
+        if m and ':' not in m:
+            if ofile is None:
+                print('    '),
+            else:
+                ofile.write('\t')
+
+        if ofile is None:
+            print(m)
+        else:
+            ofile.write('%s\n' % m)
+
+
+def main(args=None):
+    """ Entry point when executed from command line.
+    You can use zxb.py as a module with import, and this
+    function won't be executed.
+    """
+    api.config.init()
+    zxbpp.init()
+    zxbparser.init()
+    arch.zx48k.backend.init()
+    arch.zx48k.Translator.reset()
+    asmparse.init()
+
+    # ------------------------------------------------------------
+    # Command line parsing
+    # ------------------------------------------------------------
+    parser = argparse.ArgumentParser(prog='zxb')
+    parser.add_argument('PROGRAM', type=str,
+                        help='BASIC program file')
+    parser.add_argument('-d', '--debug', dest='debug', default=OPTIONS.Debug.value, action='count',
+                        help='Enable verbosity/debugging output. Additional -d increase verbosity/debug level')
+    parser.add_argument('-O', '--optimize', type=int, default=OPTIONS.optimization.value,
+                        help='Sets optimization level. '
+                             '0 = None (default level is {0})'.format(OPTIONS.optimization.value))
+    parser.add_argument('-o', '--output', type=str, dest='output_file', default=None,
+                        help='Sets output file. Default is input filename with .bin extension')
+    parser.add_argument('-T', '--tzx', action='store_true',
+                        help="Sets output format to tzx (default is .bin)")
+    parser.add_argument('-t', '--tap', action='store_true',
+                        help="Sets output format to tap (default is .bin)")
+    parser.add_argument('-B', '--BASIC', action='store_true', dest='basic',
+                        help="Creates a BASIC loader which loads the rest of the CODE. Requires -T ot -t")
+    parser.add_argument('-a', '--autorun', action='store_true',
+                        help="Sets the program to be run once loaded")
+    parser.add_argument('-A', '--asm', action='store_true',
+                        help="Sets output format to asm")
+    parser.add_argument('-S', '--org', type=str, default=str(OPTIONS.org.value),
+                        help="Start of machine code. By default %i" % OPTIONS.org.value)
+    parser.add_argument('-e', '--errmsg', type=str, dest='stderr', default=OPTIONS.StdErrFileName.value,
+                        help='Error messages file (standard error console by default)')
+    parser.add_argument('--array-base', type=int, default=OPTIONS.array_base.value,
+                        help='Default lower index for arrays ({0} by default)'.format(OPTIONS.array_base.value))
+    parser.add_argument('--string-base', type=int, default=OPTIONS.string_base.value,
+                        help='Default lower index for strings ({0} by default)'.format(OPTIONS.array_base.value))
+    parser.add_argument('-Z', '--sinclair', action='store_true',
+                        help='Enable by default some more original ZX Spectrum Sinclair BASIC features: ATTR, SCREEN$, '
+                             'POINT')
+    parser.add_argument('-H', '--heap-size', type=int, default=OPTIONS.heap_size.value,
+                        help='Sets heap size in bytes (default {0} bytes)'.format(OPTIONS.heap_size.value))
+    parser.add_argument('--debug-memory', action='store_true',
+                        help='Enables out-of-memory debug')
+    parser.add_argument('--debug-array', action='store_true',
+                        help='Enables array boundary checking')
+    parser.add_argument('--strict-bool', action='store_true',
+                        help='Enforce boolean values to be 0 or 1')
+    parser.add_argument('--enable-break', action='store_true',
+                        help='Enables program execution BREAK detection')
+    parser.add_argument('-E', '--emit-backend', action='store_true',
+                        help='Emits backend code instead of ASM or binary')
+    parser.add_argument('--explicit', action='store_true',
+                        help='Requires all variables and functions to be declared before used')
+    parser.add_argument('-D', '--define', type=str, dest='defines', action='append',
+                        help='Defines de given macro. Eg. -D MYDEBUG or -D NAME=Value')
+    parser.add_argument('-M', '--mmap', type=str, dest='memory_map', default=None,
+                        help='Generate label memory map')
+    parser.add_argument('-i', '--ignore-case', action='store_true',
+                        help='Ignore case. Makes variable names are case insensitive')
+    parser.add_argument('-I', '--include-path', type=str, default='',
+                        help='Add colon separated list of directories to add to include path. e.g. -I dir1:dir2')
+    parser.add_argument('--strict', action='store_true',
+                        help='Enables strict mode. Force explicit type declaration')
+    parser.add_argument('--headerless', action='store_true',
+                        help='Header-less mode: omit asm prologue and epilogue')
+    parser.add_argument('--version', action='version', version='%(prog)s {0}'.format(VERSION))
+    parser.add_argument('--parse-only', action='store_true',
+                        help='Only parses to check for syntax and semantic errors')
+    parser.add_argument('--append-binary', default=[], action='append',
+                        help='Appends binary to tape file (only works with -t or -T)')
+    parser.add_argument('--append-headless-binary', default=[], action='append',
+                        help='Appends binary to tape file (only works with -t or -T)')
+    parser.add_argument('-N', '--zxnext', action='store_true',
+                        help='Enables ZX Next asm extended opcodes')
+
+    options = parser.parse_args(args=args)
+
+    # ------------------------------------------------------------
+    # Setting of internal parameters according to command line
+    # ------------------------------------------------------------
+
+    OPTIONS.Debug.value = options.debug
+    OPTIONS.optimization.value = options.optimize
+    OPTIONS.outputFileName.value = options.output_file
+    OPTIONS.StdErrFileName.value = options.stderr
+    OPTIONS.array_base.value = options.array_base
+    OPTIONS.string_base.value = options.string_base
+    OPTIONS.Sinclair.value = options.sinclair
+    OPTIONS.heap_size.value = options.heap_size
+    OPTIONS.memoryCheck.value = options.debug_memory
+    OPTIONS.strictBool.value = options.strict_bool or OPTIONS.Sinclair.value
+    OPTIONS.arrayCheck.value = options.debug_array
+    OPTIONS.emitBackend.value = options.emit_backend
+    OPTIONS.enableBreak.value = options.enable_break
+    OPTIONS.explicit.value = options.explicit
+    OPTIONS.memory_map.value = options.memory_map
+    OPTIONS.strict.value = options.strict
+    OPTIONS.headerless.value = options.headerless
+    OPTIONS.zxnext.value = options.zxnext
+
+    OPTIONS.org.value = api.utils.parse_int(options.org)
+    if OPTIONS.org.value is None:
+        parser.error("Invalid --org option '{}'".format(options.org))
+
+    if options.defines:
+        for i in options.defines:
+            macro = list(i.split('=', 1))
+            name = macro[0]
+            val = ''.join(macro[1:])
+            OPTIONS.__DEFINES.value[name] = val
+            zxbpp.ID_TABLE.define(name, lineno=0)
+
+    if OPTIONS.Sinclair.value:
+        OPTIONS.array_base.value = 1
+        OPTIONS.string_base.value = 1
+        OPTIONS.strictBool.value = True
+        OPTIONS.case_insensitive.value = True
+
+    if options.ignore_case:
+        OPTIONS.case_insensitive.value = True
+
+    debug.ENABLED = OPTIONS.Debug.value
+
+    if int(options.tzx) + int(options.tap) + int(options.asm) + int(options.emit_backend) + \
+            int(options.parse_only) > 1:
+        parser.error("Options --tap, --tzx, --emit-backend, --parse-only and --asm are mutually exclusive")
+        return 3
+
+    if options.basic and not options.tzx and not options.tap:
+        parser.error('Option --BASIC and --autorun requires --tzx or tap format')
+        return 4
+
+    if options.append_binary and not options.tzx and not options.tap:
+        parser.error('Option --append-binary needs either --tap or --tzx')
+        return 5
+
+    if options.asm and options.memory_map:
+        parser.error('Option --asm and --mmap cannot be used together')
+        return 6
+
+    OPTIONS.use_loader.value = options.basic
+    OPTIONS.autorun.value = options.autorun
+
+    if options.tzx:
+        OPTIONS.output_file_type.value = 'tzx'
+    elif options.tap:
+        OPTIONS.output_file_type.value = 'tap'
+    elif options.asm:
+        OPTIONS.output_file_type.value = 'asm'
+    elif options.emit_backend:
+        OPTIONS.output_file_type.value = 'ic'
+
+    args = [options.PROGRAM]
+    if not os.path.exists(options.PROGRAM):
+        parser.error("No such file or directory: '%s'" % args[0])
+        return 2
+
+    if OPTIONS.memoryCheck.value:
+        OPTIONS.__DEFINES.value['__MEMORY_CHECK__'] = ''
+        zxbpp.ID_TABLE.define('__MEMORY_CHECK__', lineno=0)
+
+    if OPTIONS.arrayCheck.value:
+        OPTIONS.__DEFINES.value['__CHECK_ARRAY_BOUNDARY__'] = ''
+        zxbpp.ID_TABLE.define('__CHECK_ARRAY_BOUNDARY__', lineno=0)
+
+    if OPTIONS.enableBreak.value:
+        OPTIONS.__DEFINES.value['__ENABLE_BREAK__'] = ''
+        zxbpp.ID_TABLE.define('__ENABLE_BREAK__', lineno=0)
+
+    OPTIONS.include_path.value = options.include_path
+    OPTIONS.inputFileName.value = zxbparser.FILENAME = \
+        os.path.basename(args[0])
+
+    if not OPTIONS.outputFileName.value:
+        OPTIONS.outputFileName.value = \
+            os.path.splitext(os.path.basename(OPTIONS.inputFileName.value))[0] + os.path.extsep + \
+            OPTIONS.output_file_type.value
+
+    if OPTIONS.StdErrFileName.value:
+        OPTIONS.stderr.value = open_file(OPTIONS.StdErrFileName.value, 'wt', 'utf-8')
+
+    zxbpp.setMode('basic')
+    zxbpp.main(args)
+
+    if gl.has_errors:
+        debug.__DEBUG__("exiting due to errors.")
+        return 1  # Exit with errors
+
+    input_ = zxbpp.OUTPUT
+    zxbparser.parser.parse(input_, lexer=zxblex.lexer, tracking=True,
+                           debug=(OPTIONS.Debug.value > 2))
+    if gl.has_errors:
+        debug.__DEBUG__("exiting due to errors.")
+        return 1  # Exit with errors
+
+    # Optimizations
+    optimizer = api.optimize.OptimizerVisitor()
+    optimizer.visit(zxbparser.ast)
+
+    # Emits intermediate code
+    translator = arch.zx48k.Translator()
+    translator.visit(zxbparser.ast)
+
+    if gl.DATA_IS_USED:
+        gl.FUNCTIONS.extend(gl.DATA_FUNCTIONS)
+
+    # This will fill MEMORY with pending functions
+    func_visitor = arch.zx48k.FunctionTranslator(gl.FUNCTIONS)
+    func_visitor.start()
+
+    # Emits data lines
+    translator.emit_data_blocks()
+    # Emits default constant strings
+    translator.emit_strings()
+    # Emits jump tables
+    translator.emit_jump_tables()
+
+    if OPTIONS.emitBackend.value:
+        with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:
+            for quad in translator.dumpMemory(backend.MEMORY):
+                output_file.write(str(quad) + '\n')
+
+            backend.MEMORY[:] = []  # Empties memory
+            # This will fill MEMORY with global declared variables
+            translator = arch.zx48k.VarTranslator()
+            translator.visit(zxbparser.data_ast)
+
+            for quad in translator.dumpMemory(backend.MEMORY):
+                output_file.write(str(quad) + '\n')
+        return 0  # Exit success
+
+    # Join all lines into a single string and ensures an INTRO at end of file
+    asm_output = backend.emit(backend.MEMORY, optimize=OPTIONS.optimization.value > 0)
+    asm_output = optimize(asm_output) + '\n'  # invoke the -O3
+
+    asm_output = asm_output.split('\n')
+    for i in range(len(asm_output)):
+        tmp = backend.ASMS.get(asm_output[i], None)
+        if tmp is not None:
+            asm_output[i] = '\n'.join(tmp)
+
+    asm_output = '\n'.join(asm_output)
+
+    # Now filter them against the preprocessor again
+    zxbpp.setMode('asm')
+    zxbpp.OUTPUT = ''
+    zxbpp.filter_(asm_output, args[0])
+
+    # Now output the result
+    asm_output = zxbpp.OUTPUT.split('\n')
+    get_inits(asm_output)  # Find out remaining inits
+    backend.MEMORY[:] = []
+
+    # This will fill MEMORY with global declared variables
+    translator = arch.zx48k.VarTranslator()
+    translator.visit(zxbparser.data_ast)
+    if gl.has_errors:
+        debug.__DEBUG__("exiting due to errors.")
+        return 1  # Exit with errors
+
+    tmp = [x for x in backend.emit(backend.MEMORY, optimize=False) if x.strip()[0] != '#']
+    asm_output += tmp
+    asm_output = backend.emit_start() + asm_output
+    asm_output += backend.emit_end()
+
+    if options.asm:  # Only output assembler file
+        with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:
+            output(asm_output, output_file)
+    elif not options.parse_only:
+        fout = StringIO()
+        output(asm_output, fout)
+        asmparse.assemble(fout.getvalue())
+        fout.close()
+        asmparse.generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type.value,
+                                 binary_files=options.append_binary,
+                                 headless_binary_files=options.append_headless_binary)
+        if gl.has_errors:
+            return 5  # Error in assembly
+
+    if OPTIONS.memory_map.value:
+        if asmparse.MEMORY is not None:
+            with open_file(OPTIONS.memory_map.value, 'wt', 'utf-8') as f:
+                f.write(asmparse.MEMORY.memory_map)
+
+    return gl.has_errors  # Exit success
+
+
+if __name__ == '__main__':
+    sys.exit(main())  # Exit
diff --git a/zxblex.py b/zxb/zxblex.py
similarity index 100%
rename from zxblex.py
rename to zxb/zxblex.py
diff --git a/zxbparser.py b/zxb/zxbparser.py
similarity index 99%
rename from zxbparser.py
rename to zxb/zxbparser.py
index 0918da5b0..f12895399 100755
--- a/zxbparser.py
+++ b/zxb/zxbparser.py
@@ -55,10 +55,10 @@
 
 # Lexers and parsers, etc
 import ply.yacc as yacc
-import zxblex
+from . import zxblex
 from zxbpp import zxbpp
 from arch.zx48k.backend import REQUIRES
-from zxblex import tokens  # analysis:ignore -- Needed for PLY. Do not remove.  # noqa
+from .zxblex import tokens  # analysis:ignore -- Needed for PLY. Do not remove.  # noqa
 
 # ----------------------------------------------------------------------
 # Global configuration. Must be refreshed with init() i
diff --git a/zxbasm/asmparse.py b/zxbasm/asmparse.py
index deae144fc..7e8606cc9 100755
--- a/zxbasm/asmparse.py
+++ b/zxbasm/asmparse.py
@@ -13,11 +13,11 @@
 
 import os
 import re
-from zxbasm import asmlex, basic
+from . import asmlex, basic
 import ply.yacc as yacc
 
-from zxbasm.asmlex import tokens  # noqa
-from zxbasm.asm import AsmInstruction, Error
+from .asmlex import tokens  # noqa
+from .asm import AsmInstruction, Error
 from ast_ import Ast
 from api.debug import __DEBUG__
 from api.config import OPTIONS
diff --git a/zxbasm/zxbasm.py b/zxbasm/zxbasm.py
index 738199fb0..05f08ae36 100755
--- a/zxbasm/zxbasm.py
+++ b/zxbasm/zxbasm.py
@@ -15,7 +15,7 @@
 import os
 import argparse
 
-from zxbasm import asmparse
+from . import asmparse
 from zxbpp import zxbpp
 
 import api.config