8 files changed, 17 insertions, 38 deletions
diff --git a/native/src/input/keyboard/event.rs b/core/src/keyboard/event.rs
index 862f30c4..bc8437a8 100644
--- a/native/src/input/keyboard/event.rs
+++ b/core/src/keyboard/event.rs
@@ -1,5 +1,4 @@
 use super::{KeyCode, ModifiersState};
-use crate::input::ButtonState;
 
 /// A keyboard event.
 ///
@@ -9,11 +8,17 @@ use crate::input::ButtonState;
 /// [open an issue]: https://github.com/hecrj/iced/issues
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Event {
-    /// A keyboard key was pressed or released.
-    Input {
-        /// The state of the key
-        state: ButtonState,
+    /// A keyboard key was pressed.
+    KeyPressed {
+        /// The key identifier
+        key_code: KeyCode,
+
+        /// The state of the modifier keys
+        modifiers: ModifiersState,
+    },
 
+    /// A keyboard key was released.
+    KeyReleased {
         /// The key identifier
         key_code: KeyCode,
 
diff --git a/native/src/input/mouse.rs b/core/src/mouse.rs
index 7198b233..25ce6ac3 100644
--- a/native/src/input/mouse.rs
+++ b/core/src/mouse.rs
@@ -1,9 +1,8 @@
-//! Build mouse events.
+//! Reuse basic mouse types.
 mod button;
 mod event;
-
-pub mod click;
+mod interaction;
 
 pub use button::Button;
-pub use click::Click;
 pub use event::{Event, ScrollDelta};
+pub use interaction::Interaction;
diff --git a/native/src/input/mouse/button.rs b/core/src/mouse/button.rs
index aeb8a55d..aeb8a55d 100644
--- a/native/src/input/mouse/button.rs
+++ b/core/src/mouse/button.rs
diff --git a/native/src/input/mouse/event.rs b/core/src/mouse/event.rs
index aafc4fe3..2f07b207 100644
--- a/native/src/input/mouse/event.rs
+++ b/core/src/mouse/event.rs
@@ -1,5 +1,4 @@
 use super::Button;
-use crate::input::ButtonState;
 
 /// A mouse event.
 ///
@@ -24,14 +23,11 @@ pub enum Event {
         y: f32,
     },
 
-    /// A mouse button was pressed or released.
-    Input {
-        /// The state of the button
-        state: ButtonState,
+    /// A mouse button was pressed.
+    ButtonPressed(Button),
 
-        /// The button identifier
-        button: Button,
-    },
+    /// A mouse button was released.
+    ButtonReleased(Button),
 
     /// The mouse wheel was scrolled.
     WheelScrolled {
diff --git a/native/src/input.rs b/native/src/input.rs
deleted file mode 100644
index 097fa730..00000000
--- a/native/src/input.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Map your system events into input events that the runtime can understand.
-pub mod keyboard;
-pub mod mouse;
-
-mod button_state;
-
-pub use button_state::ButtonState;
diff --git a/native/src/input/button_state.rs b/native/src/input/button_state.rs
deleted file mode 100644
index 988043ba..00000000
--- a/native/src/input/button_state.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-/// The state of a button.
-#[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy)]
-pub enum ButtonState {
-    /// The button is pressed.
-    Pressed,
-
-    /// The button is __not__ pressed.
-    Released,
-}
diff --git a/native/src/input/keyboard.rs b/native/src/input/keyboard.rs
deleted file mode 100644
index 928bf492..00000000
--- a/native/src/input/keyboard.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Build keyboard events.
-mod event;
-
-pub use event::Event;
-pub use iced_core::keyboard::{KeyCode, ModifiersState};
diff --git a/native/src/input/mouse/click.rs b/native/src/mouse/click.rs
index d27bc67e..d27bc67e 100644
--- a/native/src/input/mouse/click.rs
+++ b/native/src/mouse/click.rs