diff --git a/monitors-unready/monitors-apache-nat.tf b/incubator/monitors-apache-nat.tf
similarity index 100%
rename from monitors-unready/monitors-apache-nat.tf
rename to incubator/monitors-apache-nat.tf
diff --git a/monitors-unready/monitors-cassandra.tf b/incubator/monitors-cassandra.tf
similarity index 100%
rename from monitors-unready/monitors-cassandra.tf
rename to incubator/monitors-cassandra.tf
diff --git a/monitors-unready/monitors-gcp-cloud-sql.tf b/incubator/monitors-gcp-cloud-sql.tf
similarity index 100%
rename from monitors-unready/monitors-gcp-cloud-sql.tf
rename to incubator/monitors-gcp-cloud-sql.tf
diff --git a/monitors-unready/monitors-gcp-lb.tf b/incubator/monitors-gcp-lb.tf
similarity index 100%
rename from monitors-unready/monitors-gcp-lb.tf
rename to incubator/monitors-gcp-lb.tf
diff --git a/monitors-unready/monitors-gcp-vpn.tf b/incubator/monitors-gcp-vpn.tf
similarity index 100%
rename from monitors-unready/monitors-gcp-vpn.tf
rename to incubator/monitors-gcp-vpn.tf
diff --git a/monitors-unready/monitors-kubernetes.tf b/incubator/monitors-kubernetes.tf
similarity index 100%
rename from monitors-unready/monitors-kubernetes.tf
rename to incubator/monitors-kubernetes.tf
diff --git a/monitors-unready/monitors-linux-basics.log b/incubator/monitors-linux-basics.log
similarity index 100%
rename from monitors-unready/monitors-linux-basics.log
rename to incubator/monitors-linux-basics.log
diff --git a/monitors-unready/monitors-linux-basics.tf b/incubator/monitors-linux-basics.tf
similarity index 100%
rename from monitors-unready/monitors-linux-basics.tf
rename to incubator/monitors-linux-basics.tf
diff --git a/monitors-unready/monitors-redis-containers.tf b/incubator/monitors-redis-containers.tf
similarity index 100%
rename from monitors-unready/monitors-redis-containers.tf
rename to incubator/monitors-redis-containers.tf
diff --git a/monitors-unready/monitors-redis.tf b/incubator/monitors-redis.tf
similarity index 100%
rename from monitors-unready/monitors-redis.tf
rename to incubator/monitors-redis.tf
diff --git a/os/linux/inputs.tf b/system/generic/inputs.tf
similarity index 100%
rename from os/linux/inputs.tf
rename to system/generic/inputs.tf
diff --git a/system/cpu/monitors-custom-cpu.tf b/system/generic/monitors-custom-cpu.tf
similarity index 100%
rename from system/cpu/monitors-custom-cpu.tf
rename to system/generic/monitors-custom-cpu.tf
diff --git a/system/cpu/inputs.tf b/system/linux/inputs.tf
similarity index 100%
rename from system/cpu/inputs.tf
rename to system/linux/inputs.tf
diff --git a/os/linux/monitors-linux-basics.tf b/system/linux/monitors-linux-basics.tf
similarity index 100%
rename from os/linux/monitors-linux-basics.tf
rename to system/linux/monitors-linux-basics.tf