diff --git a/lib/index.js b/lib/index.js
index 39718fd..7b0a65a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,7 +15,7 @@ console.log("Loading my-eslint-plugin");
 module.exports = {
     rules: {
         "checkbox-needs-labelling": require("./rules/checkbox-needs-labelling"),
-        "image-button-missing-aria": require("./rules/image-button-missing-aria"),
+        "image-button-missing-aria": require("./rules/buttons/image-button-missing-aria"),
         "image-link-missing-aria": require("./rules/image-link-missing-aria"),
         "input-missing-label": require("./rules/input-missing-label"),
         "menu-item-needs-labelling": require("./rules/menu-item-needs-labelling"),
@@ -26,8 +26,8 @@ module.exports = {
         "no-empty-components": require("./rules/no-empty-components"),
         "accordion-header-needs-labelling": require("./rules/accordion-header-needs-labelling"),
         "accordion-item-needs-header-and-panel": require("./rules/accordion-item-needs-header-and-panel"),
-        "compound-button-needs-labelling": require("./rules/compound-button-needs-labelling"),
-        "no-empty-buttons": require("./rules/no-empty-buttons"),
+        "compound-button-needs-labelling": require("./rules/buttons/compound-button-needs-labelling"),
+        "no-empty-buttons": require("./rules/buttons/no-empty-buttons"),
         "spin-button-needs-labelling": require("./rules/spin-button-needs-labelling"),
         "spin-button-unrecommended-labelling": require("./rules/spin-button-unrecommended-labelling"),
         "breadcrumb-needs-labelling": require("./rules/breadcrumb-needs-labelling"),
diff --git a/lib/rules/compound-button-needs-labelling.js b/lib/rules/buttons/compound-button-needs-labelling.js
similarity index 89%
rename from lib/rules/compound-button-needs-labelling.js
rename to lib/rules/buttons/compound-button-needs-labelling.js
index 957a5c6..14db29f 100644
--- a/lib/rules/compound-button-needs-labelling.js
+++ b/lib/rules/buttons/compound-button-needs-labelling.js
@@ -3,10 +3,10 @@
 
 "use strict";
 
-const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
-const { hasToolTipParent } = require("../util/hasTooltipParent");
-const { hasTextContentChild } = require("../util/hasTextContentChild");
-const { hasAssociatedLabelViaAriaLabelledBy } = require("../util/labelUtils");
+const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
+const { hasToolTipParent } = require("../../util/hasTooltipParent");
+const { hasTextContentChild } = require("../../util/hasTextContentChild");
+const { hasAssociatedLabelViaAriaLabelledBy } = require("../../util/labelUtils");
 var elementType = require("jsx-ast-utils").elementType;
 
 //------------------------------------------------------------------------------
diff --git a/lib/rules/image-button-missing-aria.js b/lib/rules/buttons/image-button-missing-aria.js
similarity index 87%
rename from lib/rules/image-button-missing-aria.js
rename to lib/rules/buttons/image-button-missing-aria.js
index 38229d1..06fad1c 100644
--- a/lib/rules/image-button-missing-aria.js
+++ b/lib/rules/buttons/image-button-missing-aria.js
@@ -3,11 +3,11 @@
 
 "use strict";
 
-const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
-const { hasToolTipParent } = require("../util/hasTooltipParent");
-const { hasTextContentChild } = require("../util/hasTextContentChild");
-const { hasAssociatedLabelViaAriaLabelledBy } = require("../util/labelUtils");
-const { applicableComponents } = require("../applicableComponents/buttonBasedComponents");
+const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
+const { hasToolTipParent } = require("../../util/hasTooltipParent");
+const { hasTextContentChild } = require("../../util/hasTextContentChild");
+const { hasAssociatedLabelViaAriaLabelledBy } = require("../../util/labelUtils");
+const { applicableComponents } = require("../../applicableComponents/buttonBasedComponents");
 var hasProp = require("jsx-ast-utils").hasProp;
 var elementType = require("jsx-ast-utils").elementType;
 
diff --git a/lib/rules/no-empty-buttons.js b/lib/rules/buttons/no-empty-buttons.js
similarity index 94%
rename from lib/rules/no-empty-buttons.js
rename to lib/rules/buttons/no-empty-buttons.js
index 7ea8c95..a48815d 100644
--- a/lib/rules/no-empty-buttons.js
+++ b/lib/rules/buttons/no-empty-buttons.js
@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { hasTextContentChild } = require("../util/hasTextContentChild");
-const { hasNonEmptyProp } = require("../util/hasNonEmptyProp");
+const { hasTextContentChild } = require("../../util/hasTextContentChild");
+const { hasNonEmptyProp } = require("../../util/hasNonEmptyProp");
 var elementType = require("jsx-ast-utils").elementType;
 var hasProp = require("jsx-ast-utils").hasProp;
 
@@ -67,4 +67,3 @@ module.exports = {
         };
     }
 };
-
diff --git a/tests/lib/rules/compound-button-needs-labelling.js b/tests/lib/rules/buttons/compound-button-needs-labelling.js
similarity index 96%
rename from tests/lib/rules/compound-button-needs-labelling.js
rename to tests/lib/rules/buttons/compound-button-needs-labelling.js
index 71e602c..022f88a 100644
--- a/tests/lib/rules/compound-button-needs-labelling.js
+++ b/tests/lib/rules/buttons/compound-button-needs-labelling.js
@@ -7,7 +7,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const rule = require("../../../lib/rules/compound-button-needs-labelling"),
+const rule = require("../../../../lib/rules/buttons/compound-button-needs-labelling"),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
diff --git a/tests/lib/rules/image-button-missing-aria.js b/tests/lib/rules/buttons/image-button-missing-aria.js
similarity index 97%
rename from tests/lib/rules/image-button-missing-aria.js
rename to tests/lib/rules/buttons/image-button-missing-aria.js
index 75b346e..fa46ffa 100644
--- a/tests/lib/rules/image-button-missing-aria.js
+++ b/tests/lib/rules/buttons/image-button-missing-aria.js
@@ -7,7 +7,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const rule = require("../../../lib/rules/image-button-missing-aria"),
+const rule = require("../../../../lib/rules/buttons/image-button-missing-aria"),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
diff --git a/tests/lib/rules/no-empty-buttons.js b/tests/lib/rules/buttons/no-empty-buttons.js
similarity index 98%
rename from tests/lib/rules/no-empty-buttons.js
rename to tests/lib/rules/buttons/no-empty-buttons.js
index 6f80c59..a68e6b8 100644
--- a/tests/lib/rules/no-empty-buttons.js
+++ b/tests/lib/rules/buttons/no-empty-buttons.js
@@ -9,7 +9,7 @@
 
 const RuleTester = require("eslint").RuleTester;
 
-const rule = require("../../../lib/rules/no-empty-buttons");
+const rule = require("../../../../lib/rules/buttons/no-empty-buttons");
 
 RuleTester.setDefaultConfig({
     parserOptions: {