diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/ModalInteractionEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/ModalInteractionEvent.java
index cb7ec2986d..bd837460c2 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/ModalInteractionEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/ModalInteractionEvent.java
@@ -20,8 +20,8 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.ModalInteraction;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.ModalInteraction;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import net.dv8tion.jda.api.requests.restaction.interactions.MessageEditCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
@@ -37,7 +37,7 @@
  * To receive these events, you must unset the <b>Interactions Endpoint URL</b> in your application dashboard.
  * You can simply remove the URL for this endpoint in your settings at the <a href="https://discord.com/developers/applications" target="_blank">Discord Developers Portal</a>.
  *
- * @see    net.dv8tion.jda.api.interactions.ModalInteraction
+ * @see    ModalInteraction
  */
 public class ModalInteractionEvent extends GenericInteractionCreateEvent implements ModalInteraction
 {
diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/command/GenericCommandInteractionEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/command/GenericCommandInteractionEvent.java
index 9e487f5298..37f69103cb 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/command/GenericCommandInteractionEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/command/GenericCommandInteractionEvent.java
@@ -22,7 +22,7 @@
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 
diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
index 515accb32b..aee930781f 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
@@ -24,7 +24,7 @@
 import net.dv8tion.jda.api.interactions.components.ActionComponent;
 import net.dv8tion.jda.api.interactions.components.Component;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.MessageEditCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
index 4aa659b123..75750e7f2e 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
@@ -27,7 +27,8 @@
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.callbacks.*;
 import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.interactions.modals.ModalInteraction;
 import net.dv8tion.jda.internal.utils.Helpers;
 
 import javax.annotation.Nonnull;
@@ -36,7 +37,7 @@
 /**
  * Abstract representation for any kind of Discord interaction.
  * <br>This includes things such as {@link net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction Slash-Commands},
- * {@link net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction Buttons} or {@link net.dv8tion.jda.api.interactions.ModalInteraction Modals}.
+ * {@link net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction Buttons} or {@link ModalInteraction Modals}.
  *
  * <p>To properly handle an interaction you must acknowledge it.
  * Each interaction has different callbacks which acknowledge the interaction. These are added by the individual {@code I...Callback} interfaces:
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/callbacks/IModalCallback.java b/src/main/java/net/dv8tion/jda/api/interactions/callbacks/IModalCallback.java
index 9050b353c6..4c2bc5db2c 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/callbacks/IModalCallback.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/callbacks/IModalCallback.java
@@ -17,7 +17,7 @@
 package net.dv8tion.jda.api.interactions.callbacks;
 
 import net.dv8tion.jda.api.interactions.Interaction;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 
 import javax.annotation.CheckReturnValue;
@@ -31,7 +31,7 @@
 public interface IModalCallback extends Interaction
 {
     /**
-     * Acknowledgement of this interaction with a {@link net.dv8tion.jda.api.interactions.components.Modal Modal}.
+     * Acknowledgement of this interaction with a {@link Modal Modal}.
      *
      * <p>This will open a popup on the target user's Discord client.
      *
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/components/Component.java b/src/main/java/net/dv8tion/jda/api/interactions/components/Component.java
index c7bc4dc69f..035943c023 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/components/Component.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/components/Component.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.utils.data.SerializableData;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInput.java b/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInput.java
index 28a9f96b34..6fdbe98657 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInput.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInput.java
@@ -17,6 +17,7 @@
 package net.dv8tion.jda.api.interactions.components.text;
 
 import net.dv8tion.jda.api.interactions.components.ActionComponent;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.internal.interactions.component.TextInputImpl;
 import net.dv8tion.jda.internal.utils.Checks;
 
@@ -26,7 +27,7 @@
 /**
  * Represents a Discord Text input component
  *
- * Must be used in {@link net.dv8tion.jda.api.interactions.components.Modal Modals}!
+ * Must be used in {@link Modal Modals}!
  */
 public interface TextInput extends ActionComponent
 {
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInputStyle.java b/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInputStyle.java
index 43b1f4666b..ec859b21ef 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInputStyle.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/components/text/TextInputStyle.java
@@ -16,7 +16,7 @@
 
 package net.dv8tion.jda.api.interactions.components.text;
 
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/components/Modal.java b/src/main/java/net/dv8tion/jda/api/interactions/modals/Modal.java
similarity index 97%
rename from src/main/java/net/dv8tion/jda/api/interactions/components/Modal.java
rename to src/main/java/net/dv8tion/jda/api/interactions/modals/Modal.java
index b53d5b07f5..a1d1667e56 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/components/Modal.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/modals/Modal.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package net.dv8tion.jda.api.interactions.components;
+package net.dv8tion.jda.api.interactions.modals;
 
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.interactions.ModalInteraction;
+import net.dv8tion.jda.api.interactions.components.ActionRow;
+import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.utils.data.SerializableData;
-import net.dv8tion.jda.internal.interactions.component.ModalImpl;
+import net.dv8tion.jda.internal.interactions.modal.ModalImpl;
 import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.CheckReturnValue;
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/ModalInteraction.java b/src/main/java/net/dv8tion/jda/api/interactions/modals/ModalInteraction.java
similarity index 95%
rename from src/main/java/net/dv8tion/jda/api/interactions/ModalInteraction.java
rename to src/main/java/net/dv8tion/jda/api/interactions/modals/ModalInteraction.java
index 4a7f911347..26870f4a56 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/ModalInteraction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/modals/ModalInteraction.java
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package net.dv8tion.jda.api.interactions;
+package net.dv8tion.jda.api.interactions.modals;
 
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.callbacks.IMessageEditCallback;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
-import net.dv8tion.jda.api.interactions.components.Modal;
-import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/net/dv8tion/jda/internal/handle/InteractionCreateHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/InteractionCreateHandler.java
index 777f2dc55d..b319d14e57 100644
--- a/src/main/java/net/dv8tion/jda/internal/handle/InteractionCreateHandler.java
+++ b/src/main/java/net/dv8tion/jda/internal/handle/InteractionCreateHandler.java
@@ -32,7 +32,7 @@
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.interactions.InteractionImpl;
-import net.dv8tion.jda.internal.interactions.ModalInteractionImpl;
+import net.dv8tion.jda.internal.interactions.modal.ModalInteractionImpl;
 import net.dv8tion.jda.internal.interactions.command.CommandAutoCompleteInteractionImpl;
 import net.dv8tion.jda.internal.interactions.command.MessageContextInteractionImpl;
 import net.dv8tion.jda.internal.interactions.command.SlashCommandInteractionImpl;
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionImpl.java
index b8cd71326b..2940a5ad99 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionImpl.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
 import net.dv8tion.jda.api.interactions.commands.CommandInteractionPayload;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.dv8tion.jda.api.utils.data.DataObject;
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
index 2653ea139a..9ad8377588 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
@@ -19,7 +19,7 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.dv8tion.jda.api.utils.data.DataObject;
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/component/ModalImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalImpl.java
similarity index 95%
rename from src/main/java/net/dv8tion/jda/internal/interactions/component/ModalImpl.java
rename to src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalImpl.java
index eaf5488ebf..a5458070a6 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/component/ModalImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalImpl.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package net.dv8tion.jda.internal.interactions.component;
+package net.dv8tion.jda.internal.interactions.modal;
 
 import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/ModalInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalInteractionImpl.java
similarity index 94%
rename from src/main/java/net/dv8tion/jda/internal/interactions/ModalInteractionImpl.java
rename to src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalInteractionImpl.java
index e87e048f4d..064afdf7ed 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/ModalInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/modal/ModalInteractionImpl.java
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package net.dv8tion.jda.internal.interactions;
+package net.dv8tion.jda.internal.interactions.modal;
 
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
-import net.dv8tion.jda.api.interactions.ModalInteraction;
+import net.dv8tion.jda.api.interactions.modals.ModalInteraction;
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import net.dv8tion.jda.api.requests.restaction.interactions.MessageEditCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
+import net.dv8tion.jda.internal.interactions.DeferrableInteractionImpl;
 import net.dv8tion.jda.internal.requests.restaction.interactions.MessageEditCallbackActionImpl;
 import net.dv8tion.jda.internal.requests.restaction.interactions.ReplyCallbackActionImpl;
 
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/interactions/ModalCallbackActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/interactions/ModalCallbackActionImpl.java
index 33350e82ce..4fb1a79a2e 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/interactions/ModalCallbackActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/interactions/ModalCallbackActionImpl.java
@@ -17,7 +17,7 @@
 package net.dv8tion.jda.internal.requests.restaction.interactions;
 
 import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.utils.data.DataObject;