diff --git a/automation/greetings.properties.json b/automation/properties/greetings.properties.json
similarity index 80%
rename from automation/greetings.properties.json
rename to automation/properties/greetings.properties.json
index 341ea46..80b8f83 100644
--- a/automation/greetings.properties.json
+++ b/automation/properties/greetings.properties.json
@@ -1,6 +1,6 @@
 {
     "name": "Greetings",
     "description": "Greets users who are first time contributers to the repo",
-    "iconName": "blank",
+    "iconName": "octicon smiley",
     "categories": ["Automation", "SDLC"]
-}
\ No newline at end of file
+}
diff --git a/automation/label.properties.json b/automation/properties/label.properties.json
similarity index 80%
rename from automation/label.properties.json
rename to automation/properties/label.properties.json
index 11d37ef..87a00c8 100644
--- a/automation/label.properties.json
+++ b/automation/properties/label.properties.json
@@ -1,6 +1,6 @@
 {
     "name": "Labeler",
     "description": "Labels pull requests based on the files changed",
-    "iconName": "blank",
+    "iconName": "octicon tag",
     "categories": ["Automation", "SDLC"]
-}
\ No newline at end of file
+}
diff --git a/automation/stale.properties.json b/automation/properties/stale.properties.json
similarity index 78%
rename from automation/stale.properties.json
rename to automation/properties/stale.properties.json
index 70550f8..c54e27d 100644
--- a/automation/stale.properties.json
+++ b/automation/properties/stale.properties.json
@@ -1,6 +1,6 @@
 {
     "name": "Stale",
     "description": "Checks for stale issues and pull requests",
-    "iconName": "blank",
+    "iconName": "octicon clock",
     "categories": ["Automation", "SDLC"]
-}
\ No newline at end of file
+}
diff --git a/ci/android.properties.json b/ci/properties/android.properties.json
similarity index 100%
rename from ci/android.properties.json
rename to ci/properties/android.properties.json
diff --git a/ci/ant.properties.json b/ci/properties/ant.properties.json
similarity index 100%
rename from ci/ant.properties.json
rename to ci/properties/ant.properties.json
diff --git a/ci/asp.net-core.properties.json b/ci/properties/asp.net-core.properties.json
similarity index 100%
rename from ci/asp.net-core.properties.json
rename to ci/properties/asp.net-core.properties.json
diff --git a/ci/blank.properties.json b/ci/properties/blank.properties.json
similarity index 100%
rename from ci/blank.properties.json
rename to ci/properties/blank.properties.json
diff --git a/ci/c-cpp.properties.json b/ci/properties/c-cpp.properties.json
similarity index 100%
rename from ci/c-cpp.properties.json
rename to ci/properties/c-cpp.properties.json
diff --git a/ci/clojure.properties.json b/ci/properties/clojure.properties.json
similarity index 100%
rename from ci/clojure.properties.json
rename to ci/properties/clojure.properties.json
diff --git a/ci/crystal.properties.json b/ci/properties/crystal.properties.json
similarity index 100%
rename from ci/crystal.properties.json
rename to ci/properties/crystal.properties.json
diff --git a/ci/dart.properties.json b/ci/properties/dart.properties.json
similarity index 100%
rename from ci/dart.properties.json
rename to ci/properties/dart.properties.json
diff --git a/ci/docker-image.properties.json b/ci/properties/docker-image.properties.json
similarity index 100%
rename from ci/docker-image.properties.json
rename to ci/properties/docker-image.properties.json
diff --git a/ci/elixir.properties.json b/ci/properties/elixir.properties.json
similarity index 100%
rename from ci/elixir.properties.json
rename to ci/properties/elixir.properties.json
diff --git a/ci/erlang.properties.json b/ci/properties/erlang.properties.json
similarity index 100%
rename from ci/erlang.properties.json
rename to ci/properties/erlang.properties.json
diff --git a/ci/go.properties.json b/ci/properties/go.properties.json
similarity index 100%
rename from ci/go.properties.json
rename to ci/properties/go.properties.json
diff --git a/ci/gradle.properties.json b/ci/properties/gradle.properties.json
similarity index 100%
rename from ci/gradle.properties.json
rename to ci/properties/gradle.properties.json
diff --git a/ci/haskell.properties.json b/ci/properties/haskell.properties.json
similarity index 100%
rename from ci/haskell.properties.json
rename to ci/properties/haskell.properties.json
diff --git a/ci/jekyll.properties.json b/ci/properties/jekyll.properties.json
similarity index 100%
rename from ci/jekyll.properties.json
rename to ci/properties/jekyll.properties.json
diff --git a/ci/maven.properties.json b/ci/properties/maven.properties.json
similarity index 100%
rename from ci/maven.properties.json
rename to ci/properties/maven.properties.json
diff --git a/ci/node.js.properties.json b/ci/properties/node.js.properties.json
similarity index 100%
rename from ci/node.js.properties.json
rename to ci/properties/node.js.properties.json
diff --git a/ci/python-package.properties.json b/ci/properties/python-package.properties.json
similarity index 100%
rename from ci/python-package.properties.json
rename to ci/properties/python-package.properties.json
diff --git a/ci/ruby.properties.json b/ci/properties/ruby.properties.json
similarity index 100%
rename from ci/ruby.properties.json
rename to ci/properties/ruby.properties.json
diff --git a/ci/rust.properties.json b/ci/properties/rust.properties.json
similarity index 100%
rename from ci/rust.properties.json
rename to ci/properties/rust.properties.json