diff --git a/docs/source/tracers/clone.rst b/docs/source/tracers/clone.rst
index 317456d..967e4ff 100644
--- a/docs/source/tracers/clone.rst
+++ b/docs/source/tracers/clone.rst
@@ -1,7 +1,7 @@
 CloneTracer
 ==================================
 
-.. autoclass:: duetector.tracers.clone.CloneTracer
+.. autoclass:: duetector.tracers.bcc.clone.CloneTracer
    :members:
    :undoc-members:
    :private-members:
diff --git a/docs/source/tracers/openat2.rst b/docs/source/tracers/openat2.rst
index 8e5cd7f..915bbf5 100644
--- a/docs/source/tracers/openat2.rst
+++ b/docs/source/tracers/openat2.rst
@@ -1,7 +1,7 @@
 OpenTracer
 ==================================
 
-.. autoclass:: duetector.tracers.openat2.OpenTracer
+.. autoclass:: duetector.tracers.bcc.openat2.OpenTracer
    :members:
    :undoc-members:
    :private-members:
diff --git a/docs/source/tracers/tcpconnect.rst b/docs/source/tracers/tcpconnect.rst
index a922e47..8d05763 100644
--- a/docs/source/tracers/tcpconnect.rst
+++ b/docs/source/tracers/tcpconnect.rst
@@ -1,7 +1,7 @@
 TcpconnectTracer
 ==================================
 
-.. autoclass:: duetector.tracers.tcpconnect.TcpconnectTracer
+.. autoclass:: duetector.tracers.bcc.tcpconnect.TcpconnectTracer
    :members:
    :undoc-members:
    :private-members:
diff --git a/docs/source/tracers/uname.rst b/docs/source/tracers/uname.rst
index d3c2d9a..86e8c3c 100644
--- a/docs/source/tracers/uname.rst
+++ b/docs/source/tracers/uname.rst
@@ -1,7 +1,7 @@
 UnameTracer
 ==================================
 
-.. autoclass:: duetector.tracers.uname.UnameTracer
+.. autoclass:: duetector.tracers.sh.uname.UnameTracer
    :members:
    :undoc-members:
    :private-members:
diff --git a/duetector/tracers/bcc/__init__.py b/duetector/tracers/bcc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/duetector/tracers/clone.py b/duetector/tracers/bcc/clone.py
similarity index 100%
rename from duetector/tracers/clone.py
rename to duetector/tracers/bcc/clone.py
diff --git a/duetector/tracers/openat2.py b/duetector/tracers/bcc/openat2.py
similarity index 100%
rename from duetector/tracers/openat2.py
rename to duetector/tracers/bcc/openat2.py
diff --git a/duetector/tracers/tcpconnect.py b/duetector/tracers/bcc/tcpconnect.py
similarity index 100%
rename from duetector/tracers/tcpconnect.py
rename to duetector/tracers/bcc/tcpconnect.py
diff --git a/duetector/tracers/register.py b/duetector/tracers/register.py
index df08838..647fef3 100644
--- a/duetector/tracers/register.py
+++ b/duetector/tracers/register.py
@@ -1,4 +1,5 @@
 # Expose for plugin system
-from . import clone, openat2, tcpconnect, uname
+from .bcc import clone, openat2, tcpconnect
+from .sh import uname
 
 registers = [openat2, uname, tcpconnect, clone]
diff --git a/duetector/tracers/sh/__init__.py b/duetector/tracers/sh/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/duetector/tracers/uname.py b/duetector/tracers/sh/uname.py
similarity index 100%
rename from duetector/tracers/uname.py
rename to duetector/tracers/sh/uname.py