diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultNotePiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/DefaultNotePiece.cs
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/IHoldNoteBody.cs
rename to osu.Game.Rulesets.Mania/Skinning/Default/IHoldNoteBody.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/HitTargetInsetContainer.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteHeadPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHoldNoteTailPiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs
rename to osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs