diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BananaPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/BananaPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/BorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/DropletPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/GrapePiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/GrapePiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperBorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/HyperDropletBorderPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/HyperDropletBorderPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PearPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PearPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PineapplePiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PineapplePiece.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/Pulp.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs b/osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/PulpFormation.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/PulpFormation.cs
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/RaspberryPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Default/RaspberryPiece.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/LegacyCatchComboCounter.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
rename to osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs