diff --git a/MANIFEST.in b/MANIFEST.in
index a43f771..8f1f343 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGES.rst
 
 include selectolax/*
 include selectolax/lexbor/*
+include selectolax/modest/*
 
 include selectolax/lexbor/*.so
 exclude selectolax/*.so
diff --git a/selectolax/node.pxi b/selectolax/modest/node.pxi
similarity index 100%
rename from selectolax/node.pxi
rename to selectolax/modest/node.pxi
diff --git a/selectolax/selection.pxi b/selectolax/modest/selection.pxi
similarity index 100%
rename from selectolax/selection.pxi
rename to selectolax/modest/selection.pxi
diff --git a/selectolax/parser.pyx b/selectolax/parser.pyx
index 96fa2ae..28c2782 100644
--- a/selectolax/parser.pyx
+++ b/selectolax/parser.pyx
@@ -2,8 +2,8 @@
 
 from cpython cimport bool
 
-include "selection.pxi"
-include "node.pxi"
+include "modest/selection.pxi"
+include "modest/node.pxi"
 include "utils.pxi"
 
 MAX_HTML_INPUT_SIZE = 8e+7
diff --git a/setup.py b/setup.py
index 4dbc6ec..7e15b4d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 USE_STATIC = False
 USE_CYTHON = False
 PLATFORM = 'windows_nt' if platform.system() == 'Windows' else 'posix'
-INCLUDE_LEXBOR = bool(os.environ.get('USE_LEXBOR', False))
+INCLUDE_LEXBOR = bool(os.environ.get('USE_LEXBOR', True))
 
 try:
     from Cython.Build import cythonize