diff --git a/pyproject.toml b/pyproject.toml
index a061b0290..ebc4794f1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,14 +38,13 @@ packages = [
     { include = "outfmt" },
     { include = "ply" },
     { include = "symbols" },
-    { include = "libzxbc" },
     { include = "libzxbasm" },
     { include = "libzxbpp" },
 ]
 
 [tool.poetry.scripts]
-zxb = 'libzxbc.zxb:main'
-zxbc = 'libzxbc.zxb:main'
+zxb = 'src.libzxbc.zxb:main'
+zxbc = 'src.libzxbc.zxb:main'
 zxbasm = 'libzxbasm.zxbasm:main'
 zxbpp = 'libzxbpp.zxbpp:entry_point'
 
diff --git a/setup.py b/setup.py
index ab914ea9d..5cbe82b44 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,6 @@
     'arch.zx48k.peephole',
     'ast_',
     'libzxbasm',
-    'libzxbc',
     'libzxbpp',
     'libzxbpp.prepro',
     'outfmt',
@@ -28,9 +27,9 @@
 package_data = {'': ['*'], 'arch.zx48k.peephole': ['opts/*']}
 
 entry_points = {
-    'console_scripts': ['zxb = libzxbc.zxb:main',
+    'console_scripts': ['zxb = src.libzxbc.zxb:main',
                         'zxbasm = libzxbasm.zxbasm:main',
-                        'zxbc = libzxbc.zxb:main',
+                        'zxbc = src.libzxbc.zxb:main',
                         'zxbpp = libzxbpp.zxbpp:entry_point']
 }
 
diff --git a/libzxbc/__init__.py b/src/libzxbc/__init__.py
similarity index 100%
rename from libzxbc/__init__.py
rename to src/libzxbc/__init__.py
diff --git a/libzxbc/keywords.py b/src/libzxbc/keywords.py
similarity index 100%
rename from libzxbc/keywords.py
rename to src/libzxbc/keywords.py
diff --git a/libzxbc/version.py b/src/libzxbc/version.py
similarity index 100%
rename from libzxbc/version.py
rename to src/libzxbc/version.py
diff --git a/libzxbc/zxb.py b/src/libzxbc/zxb.py
similarity index 100%
rename from libzxbc/zxb.py
rename to src/libzxbc/zxb.py
diff --git a/libzxbc/zxblex.py b/src/libzxbc/zxblex.py
similarity index 100%
rename from libzxbc/zxblex.py
rename to src/libzxbc/zxblex.py
diff --git a/libzxbc/zxbparser.py b/src/libzxbc/zxbparser.py
similarity index 99%
rename from libzxbc/zxbparser.py
rename to src/libzxbc/zxbparser.py
index 9783702b4..e66360c01 100755
--- a/libzxbc/zxbparser.py
+++ b/src/libzxbc/zxbparser.py
@@ -36,7 +36,6 @@
 from src.api.check import is_static
 from src.api.check import is_string
 
-
 from src.api.constants import CLASS
 from src.api.constants import SCOPE
 from src.api.constants import KIND
@@ -57,7 +56,8 @@
 
 # Lexers and parsers, etc
 import ply.yacc as yacc
-from . import zxblex
+from src.libzxbc import zxblex
+from src.libzxbc.zxblex import tokens  # noqa
 from libzxbpp import zxbpp
 import arch
 
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
index e4f12774f..c5638a186 100644
--- a/src/parsetab/tabs.dbm.bak
+++ b/src/parsetab/tabs.dbm.bak
@@ -1,4 +1,4 @@
-'zxbppparse', (0, 69354)
-'asmparse', (69632, 253939)
-'zxnext_asmparse', (323584, 284883)
-'zxbparser', (608768, 709723)
+'asmparse', (0, 253944)
+'zxnext_asmparse', (253952, 284893)
+'zxbppparse', (539136, 69359)
+'zxbparser', (608768, 710704)
diff --git a/src/parsetab/tabs.dbm.dat b/src/parsetab/tabs.dbm.dat
index dc6aa1f23..ebbd2372e 100644
Binary files a/src/parsetab/tabs.dbm.dat and b/src/parsetab/tabs.dbm.dat differ
diff --git a/src/parsetab/tabs.dbm.dir b/src/parsetab/tabs.dbm.dir
index e4f12774f..c5638a186 100644
--- a/src/parsetab/tabs.dbm.dir
+++ b/src/parsetab/tabs.dbm.dir
@@ -1,4 +1,4 @@
-'zxbppparse', (0, 69354)
-'asmparse', (69632, 253939)
-'zxnext_asmparse', (323584, 284883)
-'zxbparser', (608768, 709723)
+'asmparse', (0, 253944)
+'zxnext_asmparse', (253952, 284893)
+'zxbppparse', (539136, 69359)
+'zxbparser', (608768, 710704)
diff --git a/tests/cmdline/test_zxb.py b/tests/cmdline/test_zxb.py
index 8465fdae5..a122bde85 100644
--- a/tests/cmdline/test_zxb.py
+++ b/tests/cmdline/test_zxb.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from libzxbc import zxb
+from src.libzxbc import zxb
 import os
 
 PATH = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
diff --git a/tests/functional/test.py b/tests/functional/test.py
index 2fc8f0f15..b867d196c 100755
--- a/tests/functional/test.py
+++ b/tests/functional/test.py
@@ -31,7 +31,7 @@
 
 # Now we can import the modules from the root
 import src.api.utils  # noqa
-import libzxbc  # noqa
+from src import libzxbc # noqa
 import libzxbasm  # noqa
 import libzxbpp  # noqa
 
diff --git a/zxb.py b/zxb.py
index ab73a8152..5073e1f95 100755
--- a/zxb.py
+++ b/zxb.py
@@ -4,7 +4,7 @@
 
 import sys
 
-import libzxbc
+from src import libzxbc
 
 if __name__ == '__main__':
     print('-' * 48 + '\n* WARNING: zxb is deprecated! Use zxbc instead *\n' + '-' * 48, file=sys.stderr)
diff --git a/zxbc.py b/zxbc.py
index 6224565bc..5e6651cdb 100755
--- a/zxbc.py
+++ b/zxbc.py
@@ -4,7 +4,7 @@
 
 import sys
 
-import libzxbc
+from src import libzxbc
 
 if __name__ == '__main__':
     sys.exit(libzxbc.main())  # Exit