diff --git a/dhcpd_config.yml b/dhcpd_config.yaml
similarity index 100%
rename from dhcpd_config.yml
rename to dhcpd_config.yaml
diff --git a/dhcpd_server.yml b/dhcpd_server.yaml
similarity index 100%
rename from dhcpd_server.yml
rename to dhcpd_server.yaml
diff --git a/lab-config.yml b/lab-config.yaml
similarity index 100%
rename from lab-config.yml
rename to lab-config.yaml
diff --git a/lab-deploy.yml b/lab-deploy.yaml
similarity index 100%
rename from lab-deploy.yml
rename to lab-deploy.yaml
diff --git a/lab-poweron.yml b/lab-poweron.yaml
similarity index 100%
rename from lab-poweron.yml
rename to lab-poweron.yaml
diff --git a/lab-snapshot.yml b/lab-snapshot.yaml
similarity index 100%
rename from lab-snapshot.yml
rename to lab-snapshot.yaml
diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/files/main.yml b/roles/common/files/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/templates/main.yml b/roles/common/templates/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/validate.yml b/validate.yaml
similarity index 100%
rename from validate.yml
rename to validate.yaml
diff --git a/vmware_clone_template.yml b/vmware_clone_template.yaml
similarity index 100%
rename from vmware_clone_template.yml
rename to vmware_clone_template.yaml