diff --git a/moduleWrappers/powercord/components/settings/divider.js b/moduleWrappers/powercord/components/settings/divider.js
new file mode 100644
index 0000000..9a7e5bd
--- /dev/null
+++ b/moduleWrappers/powercord/components/settings/divider.js
@@ -0,0 +1,12 @@
+const { React } = goosemodScope.webpackModules.common;
+
+const FormDivider = goosemodScope.webpackModules.findByDisplayName('FormDivider');
+const SettingsFormClasses = goosemodScope.webpackModules.findByProps('dividerDefault', 'titleDefault');
+
+export default class Divider extends React.PureComponent {
+  render() {
+    return React.createElement(FormDivider, {
+      className: SettingsFormClasses.dividerDefault
+    });
+  }
+}
\ No newline at end of file
diff --git a/moduleWrappers/powercord/components/settings.js b/moduleWrappers/powercord/components/settings/formItem.js
similarity index 52%
rename from moduleWrappers/powercord/components/settings.js
rename to moduleWrappers/powercord/components/settings/formItem.js
index eddc846..96e3d2e 100644
--- a/moduleWrappers/powercord/components/settings.js
+++ b/moduleWrappers/powercord/components/settings/formItem.js
@@ -1,7 +1,5 @@
 const { React } = goosemodScope.webpackModules.common;
 
-const OriginalTextInput = goosemodScope.webpackModules.findByDisplayName('TextInput');
-
 const OriginalFormItem = goosemodScope.webpackModules.findByDisplayName('FormItem');
 const OriginalFormText = goosemodScope.webpackModules.findByDisplayName('FormText');
 
@@ -9,18 +7,7 @@ const Flex = goosemodScope.webpackModules.findByDisplayName('Flex');
 const Margins = goosemodScope.webpackModules.findByProps('marginTop20', 'marginBottom20');
 const FormClasses = goosemodScope.webpackModules.findByProps('formText', 'description');
 
-const FormDivider = goosemodScope.webpackModules.findByDisplayName('FormDivider');
-const SettingsFormClasses = goosemodScope.webpackModules.findByProps('dividerDefault', 'titleDefault');
-
-class Divider extends React.PureComponent {
-  render() {
-    return React.createElement(FormDivider, {
-      className: SettingsFormClasses.dividerDefault
-    });
-  }
-}
-
-class FormItem extends React.PureComponent {
+export default class FormItem extends React.PureComponent {
   render() {
     return React.createElement(OriginalFormItem, {
         title: this.props.title,
@@ -37,29 +24,4 @@ class FormItem extends React.PureComponent {
       React.createElement(Divider)
     );
   }
-}
-
-class TextInput extends React.PureComponent {
-  render() {
-    const title = this.props.children;
-    delete this.props.children;
-
-    return React.createElement(FormItem, {
-        title,
-        note: this.props.note,
-        required: this.props.required,
-
-        noteHasMargin: true
-      },
-
-      React.createElement(OriginalTextInput, {
-        ...this.props
-      })
-    );
-  }
-}
-
-module.exports = {
-  FormItem,
-  TextInput
-};
+}
\ No newline at end of file
diff --git a/moduleWrappers/powercord/components/settings/index.js b/moduleWrappers/powercord/components/settings/index.js
new file mode 100644
index 0000000..d47f4ef
--- /dev/null
+++ b/moduleWrappers/powercord/components/settings/index.js
@@ -0,0 +1,3 @@
+export { default as FormItem } from './formItem';
+export { default as TextInput } from './textInput';
+export { default as Divider } from './divider';
\ No newline at end of file
diff --git a/moduleWrappers/powercord/components/settings/textInput.js b/moduleWrappers/powercord/components/settings/textInput.js
new file mode 100644
index 0000000..38dac72
--- /dev/null
+++ b/moduleWrappers/powercord/components/settings/textInput.js
@@ -0,0 +1,25 @@
+const { React } = goosemodScope.webpackModules.common;
+
+import FormItem from './formItem';
+
+const OriginalTextInput = goosemodScope.webpackModules.findByDisplayName('TextInput');
+
+export default class TextInput extends React.PureComponent {
+  render() {
+    const title = this.props.children;
+    delete this.props.children;
+
+    return React.createElement(FormItem, {
+        title,
+        note: this.props.note,
+        required: this.props.required,
+
+        noteHasMargin: true
+      },
+
+      React.createElement(OriginalTextInput, {
+        ...this.props
+      })
+    );
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 3d11a8b..b163334 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "powercord/injector": "./moduleWrappers/powercord/injector.js",
     "powercord/webpack": "./moduleWrappers/powercord/webpack.js",
     "powercord/util": "./moduleWrappers/powercord/util.js",
-    "powercord/components/settings": "./moduleWrappers/powercord/components/settings.js",
+    "powercord/components/settings": "./moduleWrappers/powercord/components/settings/index.js",
 
     "_powercord/global": "./moduleWrappers/powercord/global/index.js"
   },