diff --git a/rsd_lib/main.py b/rsd_lib/main.py
index d7e1a50..bc0cdd9 100644
--- a/rsd_lib/main.py
+++ b/rsd_lib/main.py
@@ -16,7 +16,7 @@
 import sushy
 from sushy.resources import base
 
-from rsd_lib.resources import chassis
+from rsd_lib.resources.chassis import chassis
 from rsd_lib.resources.fabric import fabric
 from rsd_lib.resources.node import node
 from rsd_lib.resources.storage_service import storage_service
diff --git a/rsd_lib/resources/chassis/__init__.py b/rsd_lib/resources/chassis/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/rsd_lib/resources/chassis.py b/rsd_lib/resources/chassis/chassis.py
similarity index 100%
rename from rsd_lib/resources/chassis.py
rename to rsd_lib/resources/chassis/chassis.py
diff --git a/rsd_lib/tests/unit/resources/test_chassis.py b/rsd_lib/tests/unit/resources/chassis/test_chassis.py
similarity index 98%
rename from rsd_lib/tests/unit/resources/test_chassis.py
rename to rsd_lib/tests/unit/resources/chassis/test_chassis.py
index cbdd5f3..a182b63 100644
--- a/rsd_lib/tests/unit/resources/test_chassis.py
+++ b/rsd_lib/tests/unit/resources/chassis/test_chassis.py
@@ -16,7 +16,7 @@ import mock
 
 from sushy.tests.unit import base
 
-from rsd_lib.resources import chassis
+from rsd_lib.resources.chassis import chassis
 
 
 class TestChassis(base.TestCase):