diff --git a/PULL_REQUEST_TEMPLATE/feature.md b/PULL_REQUEST_TEMPLATE.md
similarity index 95%
rename from PULL_REQUEST_TEMPLATE/feature.md
rename to PULL_REQUEST_TEMPLATE.md
index ab1f88a97..012fb23ef 100644
--- a/PULL_REQUEST_TEMPLATE/feature.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -25,8 +25,6 @@ under the License.
 ##### TEST PLAN
 <!--- What steps were taken to verify -->
 
-<!--- What tests were added to verify this feature -->
-
 ##### ADDITIONAL INFORMATION
 <!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue --> 
 <!--- Check any relevant boxes with "x" -->
@@ -35,6 +33,9 @@ under the License.
     [ ] Requires DB Migration. Confirm DB Migration upgrade and downgrade tested.
     [ ] Introduces new feature or API
     [ ] Removes existing feature or API
+    [ ] Fixes bug
+    [ ] Refactors code
+    [ ] Adds test(s)
 
 ##### REVIEWERS
 
diff --git a/PULL_REQUEST_TEMPLATE/bugs.md b/PULL_REQUEST_TEMPLATE/bugs.md
deleted file mode 100644
index 7f7595268..000000000
--- a/PULL_REQUEST_TEMPLATE/bugs.md
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-##### SUMMARY
-<!--- Describe the change below, including rationale and design decisions -->
-
-##### BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
-<!--- Skip this if not applicable -->
-
-##### TEST PLAN
-<!--- What steps were taken to verify -->
-
-<!--- What tests were added to catch this bug in the future -->
-
-##### ADDITIONAL INFORMATION
-<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
-<!--- Check any relevant boxes with "x" -->
-    [ ] Has associated issue:
-    [ ] Changes UI
-    [ ] Requires DB Migration. Confirm DB Migration upgrade and downgrade tested.
-    [ ] Introduces new feature or API
-    [ ] Removes existing feature or API
-
-##### REVIEWERS
-
diff --git a/PULL_REQUEST_TEMPLATE/documentation.md b/PULL_REQUEST_TEMPLATE/documentation.md
deleted file mode 100644
index e226840dc..000000000
--- a/PULL_REQUEST_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-##### SUMMARY
-<!--- Describe the change below, including rationale and design decisions -->
-
-##### REVIEWERS
-
diff --git a/PULL_REQUEST_TEMPLATE/refactor.md b/PULL_REQUEST_TEMPLATE/refactor.md
deleted file mode 100644
index 01b197b12..000000000
--- a/PULL_REQUEST_TEMPLATE/refactor.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-##### SUMMARY
-<!--- Describe the change below, including rationale and design decisions -->
-
-##### TEST PLAN
-<!--- What steps were taken to verify features impacted by refactor -->
-
-<!--- What tests were added to confirm this refactor won't cause regressions -->
-
-##### ADDITIONAL INFORMATION
-<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue --> 
-<!--- Check any relevant boxes with "x" -->
-    [ ] Has associated issue:
-    [ ] Changes UI
-    [ ] Requires DB Migration. Confirm DB Migration upgrade and downgrade tested.
-    [ ] Removes existing feature or API
-
-##### REVIEWERS
-
diff --git a/PULL_REQUEST_TEMPLATE/test.md b/PULL_REQUEST_TEMPLATE/test.md
deleted file mode 100644
index c83053782..000000000
--- a/PULL_REQUEST_TEMPLATE/test.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-##### SUMMARY
-<!--- Describe the change below, including rationale -->
-
-##### ADDITIONAL INFORMATION
-<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
-<!--- Check box with "x" if relevant -->
-    [ ] Has associated issue:
-
-##### REVIEWERS
-