diff --git a/manifests/apinode.pp b/manifests/apinode.pp
deleted file mode 100644
index c5b0fc2..0000000
--- a/manifests/apinode.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class kickstack::apinode inherits kickstack {
-  include kickstack::keystone::api
-  include kickstack::endpoints::keystone
-
-  kickstack::endpoints::service { [ "glance"]: }
-}
diff --git a/manifests/node/api.pp b/manifests/node/api.pp
new file mode 100644
index 0000000..a207043
--- /dev/null
+++ b/manifests/node/api.pp
@@ -0,0 +1,8 @@
+class kickstack::node::api inherits kickstack {
+  include kickstack::keystone::api
+  include kickstack::keystone::endpoint
+
+
+  include kickstack::glance::api
+  include kickstack::glance::endpoint
+}
diff --git a/manifests/cloudcontroller.pp b/manifests/node/controller.pp
similarity index 100%
rename from manifests/cloudcontroller.pp
rename to manifests/node/controller.pp