diff --git a/examples/execve2.py b/examples/execve2.py
index a5272af..fadc396 100644
--- a/examples/execve2.py
+++ b/examples/execve2.py
@@ -1,7 +1,7 @@
 from pythonbpf.decorators import bpf, map, section, bpfglobal
 from ctypes import c_void_p, c_int64, c_int32, c_uint64
 from pythonbpf.helpers import ktime
-from pythonbpf.maps.maps import HashMap
+from pythonbpf.maps import HashMap
 
 
 @bpf
diff --git a/examples/execve3.py b/examples/execve3.py
index 03e0b35..f636a34 100644
--- a/examples/execve3.py
+++ b/examples/execve3.py
@@ -1,6 +1,6 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
 from pythonbpf.helpers import ktime, deref
-from pythonbpf.maps.maps import HashMap
+from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int64, c_int32, c_uint64
 
diff --git a/pythonbpf/codegen.py b/pythonbpf/codegen.py
index c3c1ae4..b749a46 100644
--- a/pythonbpf/codegen.py
+++ b/pythonbpf/codegen.py
@@ -2,7 +2,7 @@ import ast
 from llvmlite import ir
 from .license_pass import license_processing
 from .functions_pass import func_proc
-from pythonbpf.maps.maps_pass import maps_proc
+from pythonbpf.maps import maps_proc
 from .structs.structs_pass import structs_proc
 from .globals_pass import globals_processing
 import os
diff --git a/pythonbpf/maps/__init__.py b/pythonbpf/maps/__init__.py
new file mode 100644
index 0000000..7893e14
--- /dev/null
+++ b/pythonbpf/maps/__init__.py
@@ -0,0 +1,2 @@
+from .maps import HashMap, PerfEventArray
+from .maps_pass import maps_proc
diff --git a/pythonbpf/maps/maps_pass.py b/pythonbpf/maps/maps_pass.py
index 1bfa020..332a065 100644
--- a/pythonbpf/maps/maps_pass.py
+++ b/pythonbpf/maps/maps_pass.py
@@ -256,8 +256,8 @@ def process_bpf_map(func_node, module):
         if handler:
             return handler(map_name, rval, module)
         else:
-            logger.warning(f"Unknown map type {
-                           rval.func.id}, defaulting to HashMap")
+            logger.warning(f"Unknown map type "
+                           f"{rval.func.id}, defaulting to HashMap")
             process_hash_map(map_name, rval, module)
     else:
         raise ValueError("Function under @map must return a map")