diff --git a/Templates/M.2 A Key 22110/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 22110/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 22110/.gitignore
diff --git a/Templates/M.2 A Key 22110/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 22110/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 22110/meta/info.html
diff --git a/Templates/M.2 A Key 2230/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 2230/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 2230/.gitignore
diff --git a/Templates/M.2 A Key 2230/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 2230/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 2230/meta/info.html
diff --git a/Templates/M.2 A Key 2242/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 2242/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 2242/.gitignore
diff --git a/Templates/M.2 A Key 2242/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 2242/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 2242/meta/info.html
diff --git a/Templates/M.2 A Key 2260/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 2260/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 2260/.gitignore
diff --git a/Templates/M.2 A Key 2260/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 2260/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 2260/meta/info.html
diff --git a/Templates/M.2 A Key 2280/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 2280/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 2280/.gitignore
diff --git a/Templates/M.2 A Key 2280/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 2280/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 2280/meta/info.html
diff --git a/Templates/M.2 A Key 30110/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 30110/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 30110/.gitignore
diff --git a/Templates/M.2 A Key 30110/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 30110/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 30110/meta/info.html
diff --git a/Templates/M.2 A Key 3030/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 3030/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 3030/.gitignore
diff --git a/Templates/M.2 A Key 3030/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 3030/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 3030/meta/info.html
diff --git a/Templates/M.2 A Key 3042/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 3042/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 3042/.gitignore
diff --git a/Templates/M.2 A Key 3042/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 3042/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 3042/meta/info.html
diff --git a/Templates/M.2 A Key 3060/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 3060/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 3060/.gitignore
diff --git a/Templates/M.2 A Key 3060/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 3060/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 3060/meta/info.html
diff --git a/Templates/M.2 A Key 3080/.gitignore b/Templates/M.2 A Key Templates/M.2 A Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 A Key 3080/.gitignore
rename to Templates/M.2 A Key Templates/M.2 A Key 3080/.gitignore
diff --git a/Templates/M.2 A Key 3080/meta/info.html b/Templates/M.2 A Key Templates/M.2 A Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 A Key 3080/meta/info.html
rename to Templates/M.2 A Key Templates/M.2 A Key 3080/meta/info.html
diff --git a/Templates/M.2 A+E Key 22110/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 22110/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 22110/.gitignore
diff --git a/Templates/M.2 A+E Key 22110/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 22110/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 22110/meta/info.html
diff --git a/Templates/M.2 A+E Key 2230/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 2230/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2230/.gitignore
diff --git a/Templates/M.2 A+E Key 2230/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 2230/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2230/meta/info.html
diff --git a/Templates/M.2 A+E Key 2242/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 2242/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2242/.gitignore
diff --git a/Templates/M.2 A+E Key 2242/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 2242/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2242/meta/info.html
diff --git a/Templates/M.2 A+E Key 2260/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 2260/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2260/.gitignore
diff --git a/Templates/M.2 A+E Key 2260/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 2260/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2260/meta/info.html
diff --git a/Templates/M.2 A+E Key 2280/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 2280/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2280/.gitignore
diff --git a/Templates/M.2 A+E Key 2280/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 2280/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 2280/meta/info.html
diff --git a/Templates/M.2 A+E Key 30110/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 30110/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 30110/.gitignore
diff --git a/Templates/M.2 A+E Key 30110/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 30110/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 30110/meta/info.html
diff --git a/Templates/M.2 A+E Key 3030/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 3030/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3030/.gitignore
diff --git a/Templates/M.2 A+E Key 3030/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 3030/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3030/meta/info.html
diff --git a/Templates/M.2 A+E Key 3042/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 3042/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3042/.gitignore
diff --git a/Templates/M.2 A+E Key 3042/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 3042/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3042/meta/info.html
diff --git a/Templates/M.2 A+E Key 3060/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 3060/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3060/.gitignore
diff --git a/Templates/M.2 A+E Key 3060/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 3060/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3060/meta/info.html
diff --git a/Templates/M.2 A+E Key 3080/.gitignore b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 A+E Key 3080/.gitignore
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3080/.gitignore
diff --git a/Templates/M.2 A+E Key 3080/meta/info.html b/Templates/M.2 A+E Key Templates/M.2 A+E Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 A+E Key 3080/meta/info.html
rename to Templates/M.2 A+E Key Templates/M.2 A+E Key 3080/meta/info.html
diff --git a/Templates/M.2 B Key 22110/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 22110/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 22110/.gitignore
diff --git a/Templates/M.2 B Key 22110/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 22110/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 22110/meta/info.html
diff --git a/Templates/M.2 B Key 2230/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 2230/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 2230/.gitignore
diff --git a/Templates/M.2 B Key 2230/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 2230/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 2230/meta/info.html
diff --git a/Templates/M.2 B Key 2242/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 2242/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 2242/.gitignore
diff --git a/Templates/M.2 B Key 2242/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 2242/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 2242/meta/info.html
diff --git a/Templates/M.2 B Key 2260/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 2260/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 2260/.gitignore
diff --git a/Templates/M.2 B Key 2260/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 2260/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 2260/meta/info.html
diff --git a/Templates/M.2 B Key 2280/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 2280/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 2280/.gitignore
diff --git a/Templates/M.2 B Key 2280/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 2280/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 2280/meta/info.html
diff --git a/Templates/M.2 B Key 30110/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 30110/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 30110/.gitignore
diff --git a/Templates/M.2 B Key 30110/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 30110/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 30110/meta/info.html
diff --git a/Templates/M.2 B Key 3030/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 3030/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 3030/.gitignore
diff --git a/Templates/M.2 B Key 3030/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 3030/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 3030/meta/info.html
diff --git a/Templates/M.2 B Key 3042/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 3042/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 3042/.gitignore
diff --git a/Templates/M.2 B Key 3042/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 3042/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 3042/meta/info.html
diff --git a/Templates/M.2 B Key 3060/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 3060/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 3060/.gitignore
diff --git a/Templates/M.2 B Key 3060/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 3060/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 3060/meta/info.html
diff --git a/Templates/M.2 B Key 3080/.gitignore b/Templates/M.2 B Key Templates/M.2 B Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 B Key 3080/.gitignore
rename to Templates/M.2 B Key Templates/M.2 B Key 3080/.gitignore
diff --git a/Templates/M.2 B Key 3080/meta/info.html b/Templates/M.2 B Key Templates/M.2 B Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 B Key 3080/meta/info.html
rename to Templates/M.2 B Key Templates/M.2 B Key 3080/meta/info.html
diff --git a/Templates/M.2 B+M Key 22110/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 22110/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 22110/.gitignore
diff --git a/Templates/M.2 B+M Key 22110/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 22110/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 22110/meta/info.html
diff --git a/Templates/M.2 B+M Key 2230/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 2230/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2230/.gitignore
diff --git a/Templates/M.2 B+M Key 2230/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 2230/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2230/meta/info.html
diff --git a/Templates/M.2 B+M Key 2242/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 2242/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2242/.gitignore
diff --git a/Templates/M.2 B+M Key 2242/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 2242/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2242/meta/info.html
diff --git a/Templates/M.2 B+M Key 2260/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 2260/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2260/.gitignore
diff --git a/Templates/M.2 B+M Key 2260/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 2260/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2260/meta/info.html
diff --git a/Templates/M.2 B+M Key 2280/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 2280/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2280/.gitignore
diff --git a/Templates/M.2 B+M Key 2280/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 2280/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 2280/meta/info.html
diff --git a/Templates/M.2 B+M Key 30110/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 30110/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 30110/.gitignore
diff --git a/Templates/M.2 B+M Key 30110/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 30110/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 30110/meta/info.html
diff --git a/Templates/M.2 B+M Key 3030/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 3030/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3030/.gitignore
diff --git a/Templates/M.2 B+M Key 3030/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 3030/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3030/meta/info.html
diff --git a/Templates/M.2 B+M Key 3042/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 3042/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3042/.gitignore
diff --git a/Templates/M.2 B+M Key 3042/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 3042/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3042/meta/info.html
diff --git a/Templates/M.2 B+M Key 3060/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 3060/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3060/.gitignore
diff --git a/Templates/M.2 B+M Key 3060/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 3060/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3060/meta/info.html
diff --git a/Templates/M.2 B+M Key 3080/.gitignore b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 B+M Key 3080/.gitignore
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3080/.gitignore
diff --git a/Templates/M.2 B+M Key 3080/meta/info.html b/Templates/M.2 B+M Key Templates/M.2 B+M Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 B+M Key 3080/meta/info.html
rename to Templates/M.2 B+M Key Templates/M.2 B+M Key 3080/meta/info.html
diff --git a/Templates/M.2 E Key 22110/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 22110/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 22110/.gitignore
diff --git a/Templates/M.2 E Key 22110/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 22110/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 22110/meta/info.html
diff --git a/Templates/M.2 E Key 2230/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 2230/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 2230/.gitignore
diff --git a/Templates/M.2 E Key 2230/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 2230/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 2230/meta/info.html
diff --git a/Templates/M.2 E Key 2242/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 2242/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 2242/.gitignore
diff --git a/Templates/M.2 E Key 2242/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 2242/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 2242/meta/info.html
diff --git a/Templates/M.2 E Key 2260/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 2260/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 2260/.gitignore
diff --git a/Templates/M.2 E Key 2260/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 2260/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 2260/meta/info.html
diff --git a/Templates/M.2 E Key 2280/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 2280/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 2280/.gitignore
diff --git a/Templates/M.2 E Key 2280/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 2280/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 2280/meta/info.html
diff --git a/Templates/M.2 E Key 30110/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 30110/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 30110/.gitignore
diff --git a/Templates/M.2 E Key 30110/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 30110/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 30110/meta/info.html
diff --git a/Templates/M.2 E Key 3030/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 3030/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 3030/.gitignore
diff --git a/Templates/M.2 E Key 3030/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 3030/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 3030/meta/info.html
diff --git a/Templates/M.2 E Key 3042/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 3042/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 3042/.gitignore
diff --git a/Templates/M.2 E Key 3042/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 3042/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 3042/meta/info.html
diff --git a/Templates/M.2 E Key 3060/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 3060/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 3060/.gitignore
diff --git a/Templates/M.2 E Key 3060/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 3060/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 3060/meta/info.html
diff --git a/Templates/M.2 E Key 3080/.gitignore b/Templates/M.2 E Key Templates/M.2 E Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 E Key 3080/.gitignore
rename to Templates/M.2 E Key Templates/M.2 E Key 3080/.gitignore
diff --git a/Templates/M.2 E Key 3080/meta/info.html b/Templates/M.2 E Key Templates/M.2 E Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 E Key 3080/meta/info.html
rename to Templates/M.2 E Key Templates/M.2 E Key 3080/meta/info.html
diff --git a/Templates/M.2 M Key 22110/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 22110/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 22110/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 22110/.gitignore
diff --git a/Templates/M.2 M Key 22110/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 22110/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 22110/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 22110/meta/info.html
diff --git a/Templates/M.2 M Key 2230/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 2230/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 2230/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 2230/.gitignore
diff --git a/Templates/M.2 M Key 2230/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 2230/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 2230/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 2230/meta/info.html
diff --git a/Templates/M.2 M Key 2242/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 2242/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 2242/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 2242/.gitignore
diff --git a/Templates/M.2 M Key 2242/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 2242/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 2242/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 2242/meta/info.html
diff --git a/Templates/M.2 M Key 2260/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 2260/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 2260/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 2260/.gitignore
diff --git a/Templates/M.2 M Key 2260/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 2260/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 2260/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 2260/meta/info.html
diff --git a/Templates/M.2 M Key 2280/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 2280/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 2280/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 2280/.gitignore
diff --git a/Templates/M.2 M Key 2280/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 2280/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 2280/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 2280/meta/info.html
diff --git a/Templates/M.2 M Key 30110/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 30110/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 30110/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 30110/.gitignore
diff --git a/Templates/M.2 M Key 30110/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 30110/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 30110/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 30110/meta/info.html
diff --git a/Templates/M.2 M Key 3030/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 3030/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 3030/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 3030/.gitignore
diff --git a/Templates/M.2 M Key 3030/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 3030/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 3030/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 3030/meta/info.html
diff --git a/Templates/M.2 M Key 3042/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 3042/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 3042/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 3042/.gitignore
diff --git a/Templates/M.2 M Key 3042/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 3042/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 3042/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 3042/meta/info.html
diff --git a/Templates/M.2 M Key 3060/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 3060/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 3060/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 3060/.gitignore
diff --git a/Templates/M.2 M Key 3060/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 3060/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 3060/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 3060/meta/info.html
diff --git a/Templates/M.2 M Key 3080/.gitignore b/Templates/M.2 M Key Templates/M.2 M Key 3080/.gitignore
similarity index 100%
rename from Templates/M.2 M Key 3080/.gitignore
rename to Templates/M.2 M Key Templates/M.2 M Key 3080/.gitignore
diff --git a/Templates/M.2 M Key 3080/meta/info.html b/Templates/M.2 M Key Templates/M.2 M Key 3080/meta/info.html
similarity index 100%
rename from Templates/M.2 M Key 3080/meta/info.html
rename to Templates/M.2 M Key Templates/M.2 M Key 3080/meta/info.html
diff --git a/Templates/PCIexpress_x16_full/.gitignore b/Templates/PCIe x1 Templates/PCIexpress_x1_full/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x16_full/.gitignore
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/.gitignore
diff --git a/Templates/PCIexpress_x1_full/PCIexpress_connector.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_full/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pcb b/Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pcb
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pcb
diff --git a/Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pro b/Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pro
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_pro
diff --git a/Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/PCIexpress_x1_full.kicad_sch
diff --git a/Templates/PCIexpress_x1_full/decap.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_full/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_full/decap.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/decap.kicad_sch
diff --git a/Templates/PCIexpress_x16_full/fp-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_full/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_full/fp-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/fp-lib-table
diff --git a/Templates/PCIexpress_x1_full/meta/info.html b/Templates/PCIe x1 Templates/PCIexpress_x1_full/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x1_full/meta/info.html
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/meta/info.html
diff --git a/Templates/PCIexpress_x16_full/sym-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_full/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_full/sym-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/sym-lib-table
diff --git a/Templates/PCIexpress_x1_full/term.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_full/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_full/term.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_full/term.kicad_sch
diff --git a/Templates/PCIexpress_x16_half/.gitignore b/Templates/PCIe x1 Templates/PCIexpress_x1_half/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x16_half/.gitignore
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/.gitignore
diff --git a/Templates/PCIexpress_x1_half/PCIexpress_connector.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_half/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pcb b/Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pcb
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pcb
diff --git a/Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pro b/Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pro
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_pro
diff --git a/Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/PCIexpress_x1_half.kicad_sch
diff --git a/Templates/PCIexpress_x1_half/decap.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_half/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_half/decap.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/decap.kicad_sch
diff --git a/Templates/PCIexpress_x16_half/fp-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_half/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_half/fp-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/fp-lib-table
diff --git a/Templates/PCIexpress_x1_half/meta/info.html b/Templates/PCIe x1 Templates/PCIexpress_x1_half/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x1_half/meta/info.html
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/meta/info.html
diff --git a/Templates/PCIexpress_x16_half/sym-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_half/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_half/sym-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/sym-lib-table
diff --git a/Templates/PCIexpress_x1_half/term.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_half/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_half/term.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_half/term.kicad_sch
diff --git a/Templates/PCIexpress_x16_low/.gitignore b/Templates/PCIe x1 Templates/PCIexpress_x1_low/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x16_low/.gitignore
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/.gitignore
diff --git a/Templates/PCIexpress_x1_low/PCIexpress_connector.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_low/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pcb b/Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pcb
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pcb
diff --git a/Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pro b/Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pro
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_pro
diff --git a/Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/PCIexpress_x1_low.kicad_sch
diff --git a/Templates/PCIexpress_x1_low/decap.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_low/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_low/decap.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/decap.kicad_sch
diff --git a/Templates/PCIexpress_x16_low/fp-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_low/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_low/fp-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/fp-lib-table
diff --git a/Templates/PCIexpress_x1_low/meta/info.html b/Templates/PCIe x1 Templates/PCIexpress_x1_low/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x1_low/meta/info.html
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/meta/info.html
diff --git a/Templates/PCIexpress_x16_low/sym-lib-table b/Templates/PCIe x1 Templates/PCIexpress_x1_low/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x16_low/sym-lib-table
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/sym-lib-table
diff --git a/Templates/PCIexpress_x1_low/term.kicad_sch b/Templates/PCIe x1 Templates/PCIexpress_x1_low/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x1_low/term.kicad_sch
rename to Templates/PCIe x1 Templates/PCIexpress_x1_low/term.kicad_sch
diff --git a/Templates/PCIexpress_x1_full/.gitignore b/Templates/PCIe x16 Templates/PCIexpress_x16_full/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x1_full/.gitignore
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/.gitignore
diff --git a/Templates/PCIexpress_x16_full/PCIexpress_connector.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_full/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pcb b/Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pcb
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pcb
diff --git a/Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pro b/Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pro
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_pro
diff --git a/Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/PCIexpress_x16_full.kicad_sch
diff --git a/Templates/PCIexpress_x16_full/decap.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_full/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_full/decap.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/decap.kicad_sch
diff --git a/Templates/PCIexpress_x1_full/fp-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_full/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_full/fp-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/fp-lib-table
diff --git a/Templates/PCIexpress_x16_full/meta/info.html b/Templates/PCIe x16 Templates/PCIexpress_x16_full/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x16_full/meta/info.html
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/meta/info.html
diff --git a/Templates/PCIexpress_x1_full/sym-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_full/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_full/sym-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/sym-lib-table
diff --git a/Templates/PCIexpress_x16_full/term.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_full/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_full/term.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_full/term.kicad_sch
diff --git a/Templates/PCIexpress_x1_half/.gitignore b/Templates/PCIe x16 Templates/PCIexpress_x16_half/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x1_half/.gitignore
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/.gitignore
diff --git a/Templates/PCIexpress_x16_half/PCIexpress_connector.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_half/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pcb b/Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pcb
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pcb
diff --git a/Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pro b/Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pro
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_pro
diff --git a/Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/PCIexpress_x16_half.kicad_sch
diff --git a/Templates/PCIexpress_x16_half/decap.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_half/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_half/decap.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/decap.kicad_sch
diff --git a/Templates/PCIexpress_x1_half/fp-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_half/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_half/fp-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/fp-lib-table
diff --git a/Templates/PCIexpress_x16_half/meta/info.html b/Templates/PCIe x16 Templates/PCIexpress_x16_half/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x16_half/meta/info.html
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/meta/info.html
diff --git a/Templates/PCIexpress_x1_half/sym-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_half/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_half/sym-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/sym-lib-table
diff --git a/Templates/PCIexpress_x16_half/term.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_half/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_half/term.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_half/term.kicad_sch
diff --git a/Templates/PCIexpress_x1_low/.gitignore b/Templates/PCIe x16 Templates/PCIexpress_x16_low/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x1_low/.gitignore
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/.gitignore
diff --git a/Templates/PCIexpress_x16_low/PCIexpress_connector.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_low/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pcb b/Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pcb
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pcb
diff --git a/Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pro b/Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pro
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_pro
diff --git a/Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/PCIexpress_x16_low.kicad_sch
diff --git a/Templates/PCIexpress_x16_low/decap.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_low/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_low/decap.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/decap.kicad_sch
diff --git a/Templates/PCIexpress_x1_low/fp-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_low/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_low/fp-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/fp-lib-table
diff --git a/Templates/PCIexpress_x16_low/meta/info.html b/Templates/PCIe x16 Templates/PCIexpress_x16_low/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x16_low/meta/info.html
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/meta/info.html
diff --git a/Templates/PCIexpress_x1_low/sym-lib-table b/Templates/PCIe x16 Templates/PCIexpress_x16_low/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x1_low/sym-lib-table
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/sym-lib-table
diff --git a/Templates/PCIexpress_x16_low/term.kicad_sch b/Templates/PCIe x16 Templates/PCIexpress_x16_low/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x16_low/term.kicad_sch
rename to Templates/PCIe x16 Templates/PCIexpress_x16_low/term.kicad_sch
diff --git a/Templates/PCIexpress_x2_full/.gitignore b/Templates/PCIe x2 Templates/PCIexpress_x2_full/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x2_full/.gitignore
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/.gitignore
diff --git a/Templates/PCIexpress_x2_full/PCIexpress_connector.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_full/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pcb b/Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pcb
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pcb
diff --git a/Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pro b/Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pro
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_pro
diff --git a/Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/PCIexpress_x2_full.kicad_sch
diff --git a/Templates/PCIexpress_x2_full/decap.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_full/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_full/decap.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/decap.kicad_sch
diff --git a/Templates/PCIexpress_x2_full/meta/info.html b/Templates/PCIe x2 Templates/PCIexpress_x2_full/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x2_full/meta/info.html
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/meta/info.html
diff --git a/Templates/PCIexpress_x2_full/term.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_full/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_full/term.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_full/term.kicad_sch
diff --git a/Templates/PCIexpress_x2_half/.gitignore b/Templates/PCIe x2 Templates/PCIexpress_x2_half/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x2_half/.gitignore
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/.gitignore
diff --git a/Templates/PCIexpress_x2_half/PCIexpress_connector.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_half/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pcb b/Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pcb
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pcb
diff --git a/Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pro b/Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pro
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_pro
diff --git a/Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/PCIexpress_x2_half.kicad_sch
diff --git a/Templates/PCIexpress_x2_half/decap.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_half/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_half/decap.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/decap.kicad_sch
diff --git a/Templates/PCIexpress_x2_half/meta/info.html b/Templates/PCIe x2 Templates/PCIexpress_x2_half/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x2_half/meta/info.html
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/meta/info.html
diff --git a/Templates/PCIexpress_x2_half/term.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_half/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_half/term.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_half/term.kicad_sch
diff --git a/Templates/PCIexpress_x2_low/.gitignore b/Templates/PCIe x2 Templates/PCIexpress_x2_low/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x2_low/.gitignore
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/.gitignore
diff --git a/Templates/PCIexpress_x2_low/PCIexpress_connector.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_low/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pcb b/Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pcb
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pcb
diff --git a/Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pro b/Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pro
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_pro
diff --git a/Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/PCIexpress_x2_low.kicad_sch
diff --git a/Templates/PCIexpress_x2_low/decap.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_low/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_low/decap.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/decap.kicad_sch
diff --git a/Templates/PCIexpress_x2_low/meta/info.html b/Templates/PCIe x2 Templates/PCIexpress_x2_low/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x2_low/meta/info.html
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/meta/info.html
diff --git a/Templates/PCIexpress_x2_low/term.kicad_sch b/Templates/PCIe x2 Templates/PCIexpress_x2_low/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x2_low/term.kicad_sch
rename to Templates/PCIe x2 Templates/PCIexpress_x2_low/term.kicad_sch
diff --git a/Templates/PCIexpress_x4_full/.gitignore b/Templates/PCIe x4 Templates/PCIexpress_x4_full/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x4_full/.gitignore
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/.gitignore
diff --git a/Templates/PCIexpress_x4_full/PCIexpress_connector.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_full/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pcb b/Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pcb
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pcb
diff --git a/Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pro b/Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pro
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_pro
diff --git a/Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/PCIexpress_x4_full.kicad_sch
diff --git a/Templates/PCIexpress_x4_full/decap.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_full/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_full/decap.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/decap.kicad_sch
diff --git a/Templates/PCIexpress_x4_full/fp-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_full/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_full/fp-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/fp-lib-table
diff --git a/Templates/PCIexpress_x4_full/meta/info.html b/Templates/PCIe x4 Templates/PCIexpress_x4_full/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x4_full/meta/info.html
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/meta/info.html
diff --git a/Templates/PCIexpress_x4_full/sym-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_full/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_full/sym-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/sym-lib-table
diff --git a/Templates/PCIexpress_x4_full/term.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_full/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_full/term.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_full/term.kicad_sch
diff --git a/Templates/PCIexpress_x4_half/.gitignore b/Templates/PCIe x4 Templates/PCIexpress_x4_half/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x4_half/.gitignore
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/.gitignore
diff --git a/Templates/PCIexpress_x4_half/PCIexpress_connector.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_half/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pcb b/Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pcb
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pcb
diff --git a/Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pro b/Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pro
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_pro
diff --git a/Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/PCIexpress_x4_half.kicad_sch
diff --git a/Templates/PCIexpress_x4_half/decap.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_half/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_half/decap.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/decap.kicad_sch
diff --git a/Templates/PCIexpress_x4_half/fp-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_half/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_half/fp-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/fp-lib-table
diff --git a/Templates/PCIexpress_x4_half/meta/info.html b/Templates/PCIe x4 Templates/PCIexpress_x4_half/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x4_half/meta/info.html
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/meta/info.html
diff --git a/Templates/PCIexpress_x4_half/sym-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_half/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_half/sym-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/sym-lib-table
diff --git a/Templates/PCIexpress_x4_half/term.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_half/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_half/term.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_half/term.kicad_sch
diff --git a/Templates/PCIexpress_x4_low/.gitignore b/Templates/PCIe x4 Templates/PCIexpress_x4_low/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x4_low/.gitignore
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/.gitignore
diff --git a/Templates/PCIexpress_x4_low/PCIexpress_connector.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_low/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pcb b/Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pcb
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pcb
diff --git a/Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pro b/Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pro
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_pro
diff --git a/Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/PCIexpress_x4_low.kicad_sch
diff --git a/Templates/PCIexpress_x4_low/decap.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_low/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_low/decap.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/decap.kicad_sch
diff --git a/Templates/PCIexpress_x4_low/fp-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_low/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_low/fp-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/fp-lib-table
diff --git a/Templates/PCIexpress_x4_low/meta/info.html b/Templates/PCIe x4 Templates/PCIexpress_x4_low/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x4_low/meta/info.html
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/meta/info.html
diff --git a/Templates/PCIexpress_x4_low/sym-lib-table b/Templates/PCIe x4 Templates/PCIexpress_x4_low/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x4_low/sym-lib-table
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/sym-lib-table
diff --git a/Templates/PCIexpress_x4_low/term.kicad_sch b/Templates/PCIe x4 Templates/PCIexpress_x4_low/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x4_low/term.kicad_sch
rename to Templates/PCIe x4 Templates/PCIexpress_x4_low/term.kicad_sch
diff --git a/Templates/PCIexpress_x8_full/.gitignore b/Templates/PCIe x8 Templates/PCIexpress_x8_full/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x8_full/.gitignore
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/.gitignore
diff --git a/Templates/PCIexpress_x8_full/PCIexpress_connector.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_full/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pcb b/Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pcb
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pcb
diff --git a/Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pro b/Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pro
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_pro
diff --git a/Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/PCIexpress_x8_full.kicad_sch
diff --git a/Templates/PCIexpress_x8_full/decap.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_full/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_full/decap.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/decap.kicad_sch
diff --git a/Templates/PCIexpress_x8_full/fp-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_full/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_full/fp-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/fp-lib-table
diff --git a/Templates/PCIexpress_x8_full/meta/info.html b/Templates/PCIe x8 Templates/PCIexpress_x8_full/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x8_full/meta/info.html
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/meta/info.html
diff --git a/Templates/PCIexpress_x8_full/sym-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_full/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_full/sym-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/sym-lib-table
diff --git a/Templates/PCIexpress_x8_full/term.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_full/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_full/term.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_full/term.kicad_sch
diff --git a/Templates/PCIexpress_x8_half/.gitignore b/Templates/PCIe x8 Templates/PCIexpress_x8_half/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x8_half/.gitignore
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/.gitignore
diff --git a/Templates/PCIexpress_x8_half/PCIexpress_connector.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_half/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pcb b/Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pcb
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pcb
diff --git a/Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pro b/Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pro
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_pro
diff --git a/Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/PCIexpress_x8_half.kicad_sch
diff --git a/Templates/PCIexpress_x8_half/decap.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_half/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_half/decap.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/decap.kicad_sch
diff --git a/Templates/PCIexpress_x8_half/fp-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_half/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_half/fp-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/fp-lib-table
diff --git a/Templates/PCIexpress_x8_half/meta/info.html b/Templates/PCIe x8 Templates/PCIexpress_x8_half/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x8_half/meta/info.html
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/meta/info.html
diff --git a/Templates/PCIexpress_x8_half/sym-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_half/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_half/sym-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/sym-lib-table
diff --git a/Templates/PCIexpress_x8_half/term.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_half/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_half/term.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_half/term.kicad_sch
diff --git a/Templates/PCIexpress_x8_low/.gitignore b/Templates/PCIe x8 Templates/PCIexpress_x8_low/.gitignore
similarity index 100%
rename from Templates/PCIexpress_x8_low/.gitignore
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/.gitignore
diff --git a/Templates/PCIexpress_x8_low/PCIexpress_connector.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_connector.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_low/PCIexpress_connector.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_connector.kicad_sch
diff --git a/Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pcb b/Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pcb
similarity index 100%
rename from Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pcb
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pcb
diff --git a/Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pro b/Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pro
similarity index 100%
rename from Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pro
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_pro
diff --git a/Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/PCIexpress_x8_low.kicad_sch
diff --git a/Templates/PCIexpress_x8_low/decap.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_low/decap.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_low/decap.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/decap.kicad_sch
diff --git a/Templates/PCIexpress_x8_low/fp-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_low/fp-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_low/fp-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/fp-lib-table
diff --git a/Templates/PCIexpress_x8_low/meta/info.html b/Templates/PCIe x8 Templates/PCIexpress_x8_low/meta/info.html
similarity index 100%
rename from Templates/PCIexpress_x8_low/meta/info.html
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/meta/info.html
diff --git a/Templates/PCIexpress_x8_low/sym-lib-table b/Templates/PCIe x8 Templates/PCIexpress_x8_low/sym-lib-table
similarity index 100%
rename from Templates/PCIexpress_x8_low/sym-lib-table
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/sym-lib-table
diff --git a/Templates/PCIexpress_x8_low/term.kicad_sch b/Templates/PCIe x8 Templates/PCIexpress_x8_low/term.kicad_sch
similarity index 100%
rename from Templates/PCIexpress_x8_low/term.kicad_sch
rename to Templates/PCIe x8 Templates/PCIexpress_x8_low/term.kicad_sch