diff --git a/manifests/site.pp b/manifests/site.pp
index 191605f..7c3afdb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -26,18 +26,4 @@ File { backup => false }
 # Puppet Enterprise console and External Node Classifiers (ENC's).
 #
 # For more on node definitions, see: https://puppet.com/docs/puppet/latest/lang_node_definitions.html
-node default {
-  class { 'ntp':
-    servers => [ '0.us.pool.ntp.org', '1.us.pool.ntp.org', '2.us.pool.ntp.org', '3.us.pool.ntp.org' ],
-  }
-}
-node puppet.test.com {
-  include ngrok
-  ngrok::tunnel { 'webhook':
-    proto => 'tcp',
-    addr  => '8170',
-  }
-  class { 'ntp':
-    servers => [ '0.us.pool.ntp.org', '1.us.pool.ntp.org', '2.us.pool.ntp.org', '3.us.pool.ntp.org' ],
-  }
-}
+node default {}
diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
deleted file mode 100644
index ae85e65..0000000
--- a/site-modules/profile/manifests/base.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class profile::base {
-
-  #the base profile should include component modules that will be on all nodes
-
-}
diff --git a/site-modules/profile/manifests/base/linux.pp b/site-modules/profile/manifests/base/linux.pp
new file mode 100644
index 0000000..7626bd0
--- /dev/null
+++ b/site-modules/profile/manifests/base/linux.pp
@@ -0,0 +1,6 @@
+# Base profile for linux nodes
+class profile::base::linux {
+  class { 'ntp':
+    servers => [ '0.us.pool.ntp.org', '1.us.pool.ntp.org', '2.us.pool.ntp.org', '3.us.pool.ntp.org' ],
+  }
+}
diff --git a/site-modules/profile/manifests/base/windows.pp b/site-modules/profile/manifests/base/windows.pp
new file mode 100644
index 0000000..94ff0c1
--- /dev/null
+++ b/site-modules/profile/manifests/base/windows.pp
@@ -0,0 +1,2 @@
+# Base profile for Windows nodes
+class profile::base::windows {}
diff --git a/site-modules/profile/manifests/puppet/cd4pe.pp b/site-modules/profile/manifests/puppet/cd4pe.pp
new file mode 100644
index 0000000..0484b5a
--- /dev/null
+++ b/site-modules/profile/manifests/puppet/cd4pe.pp
@@ -0,0 +1 @@
+class profile::puppet::cd4pe {}
diff --git a/site-modules/profile/manifests/puppet/master.pp b/site-modules/profile/manifests/puppet/master.pp
new file mode 100644
index 0000000..3b1ffa0
--- /dev/null
+++ b/site-modules/profile/manifests/puppet/master.pp
@@ -0,0 +1,7 @@
+class profile::puppet::master {
+  include ngrok
+  ngrok::tunnel { 'webhook':
+    proto => 'tcp',
+    addr  => '8170',
+  }
+}
diff --git a/site-modules/role/manifests/basic_linux.pp b/site-modules/role/manifests/basic_linux.pp
new file mode 100644
index 0000000..5f0b922
--- /dev/null
+++ b/site-modules/role/manifests/basic_linux.pp
@@ -0,0 +1,4 @@
+# Role for basic linux node
+class role::basic_linux {
+  include profile::base::linux
+}
diff --git a/site-modules/role/manifests/basic_windows.pp b/site-modules/role/manifests/basic_windows.pp
new file mode 100644
index 0000000..efd9989
--- /dev/null
+++ b/site-modules/role/manifests/basic_windows.pp
@@ -0,0 +1,4 @@
+# Role for basic Windows node
+class role::basic_windows {
+  include profile::base::windows
+}
diff --git a/site-modules/role/manifests/database_server.pp b/site-modules/role/manifests/database_server.pp
deleted file mode 100644
index aacc912..0000000
--- a/site-modules/role/manifests/database_server.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class role::database_server {
-
-  #This role would be made of all the profiles that need to be included to make a database server work
-  #All roles should include the base profile
-  include profile::base
-
-}
diff --git a/site-modules/role/manifests/example.pp b/site-modules/role/manifests/example.pp
deleted file mode 100644
index 2c1d2d7..0000000
--- a/site-modules/role/manifests/example.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::example {
-
-}
diff --git a/site-modules/role/manifests/master.pp b/site-modules/role/manifests/master.pp
new file mode 100644
index 0000000..7d18597
--- /dev/null
+++ b/site-modules/role/manifests/master.pp
@@ -0,0 +1,5 @@
+# Role for puppet master
+class role::master {
+  include profile::base::linux
+  include profile::puppet::master
+}