diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
new file mode 100644
index 0000000000..8a91f82437
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtBanana.cs
@@ -0,0 +1,18 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Banana"/> caught by the catcher.
+    /// </summary>
+    public class CaughtBanana : CaughtObject
+    {
+        public CaughtBanana()
+            : base(CatchSkinComponents.Banana, _ => new BananaPiece())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
new file mode 100644
index 0000000000..4a3397feff
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtDroplet.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Droplet"/> caught by the catcher.
+    /// </summary>
+    public class CaughtDroplet : CaughtObject
+    {
+        public override bool StaysOnPlate => false;
+
+        public CaughtDroplet()
+            : base(CatchSkinComponents.Droplet, _ => new DropletPiece())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
new file mode 100644
index 0000000000..140b411c88
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtFruit.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Catch.Skinning.Default;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Represents a <see cref="Fruit"/> caught by the catcher.
+    /// </summary>
+    public class CaughtFruit : CaughtObject, IHasFruitState
+    {
+        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
+
+        public CaughtFruit()
+            : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
+        {
+        }
+
+        public override void CopyStateFrom(IHasCatchObjectState objectState)
+        {
+            base.CopyStateFrom(objectState);
+
+            var fruitState = (IHasFruitState)objectState;
+            VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
index 87319a4498..e597d1a4cd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -61,40 +60,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             base.FreeAfterUse();
         }
     }
-
-    public class CaughtFruit : CaughtObject, IHasFruitState
-    {
-        public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
-
-        public CaughtFruit()
-            : base(CatchSkinComponents.Fruit, _ => new FruitPiece())
-        {
-        }
-
-        public override void CopyStateFrom(IHasCatchObjectState objectState)
-        {
-            base.CopyStateFrom(objectState);
-
-            var fruitState = (IHasFruitState)objectState;
-            VisualRepresentation.Value = fruitState.VisualRepresentation.Value;
-        }
-    }
-
-    public class CaughtBanana : CaughtObject
-    {
-        public CaughtBanana()
-            : base(CatchSkinComponents.Banana, _ => new BananaPiece())
-        {
-        }
-    }
-
-    public class CaughtDroplet : CaughtObject
-    {
-        public override bool StaysOnPlate => false;
-
-        public CaughtDroplet()
-            : base(CatchSkinComponents.Droplet, _ => new DropletPiece())
-        {
-        }
-    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
index 0a75fb2224..55ca502877 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasCatchObjectState.cs
@@ -19,12 +19,4 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         float Rotation { get; }
         Vector2 Scale { get; }
     }
-
-    /// <summary>
-    /// Provides a visual state of a <see cref="Fruit"/>.
-    /// </summary>
-    public interface IHasFruitState : IHasCatchObjectState
-    {
-        Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
-    }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs
new file mode 100644
index 0000000000..2d4de543c3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/IHasFruitState.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    /// <summary>
+    /// Provides a visual state of a <see cref="Fruit"/>.
+    /// </summary>
+    public interface IHasFruitState : IHasCatchObjectState
+    {
+        Bindable<FruitVisualRepresentation> VisualRepresentation { get; }
+    }
+}