diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu1080.swf b/Minecraft.Assets/Common/Media/SkinSelectMenu1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu1080.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenu1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu480.swf b/Minecraft.Assets/Common/Media/SkinSelectMenu480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu480.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenu480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu720.swf b/Minecraft.Assets/Common/Media/SkinSelectMenu720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenu720.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenu720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuSplit1080.swf b/Minecraft.Assets/Common/Media/SkinSelectMenuSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuSplit1080.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenuSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuSplit720.swf b/Minecraft.Assets/Common/Media/SkinSelectMenuSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuSplit720.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenuSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuVita.swf b/Minecraft.Assets/Common/Media/SkinSelectMenuVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SkinSelectMenuVita.swf
rename to Minecraft.Assets/Common/Media/SkinSelectMenuVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPost1080.swf b/Minecraft.Assets/Common/Media/SocialPost1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPost1080.swf
rename to Minecraft.Assets/Common/Media/SocialPost1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPost480.swf b/Minecraft.Assets/Common/Media/SocialPost480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPost480.swf
rename to Minecraft.Assets/Common/Media/SocialPost480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPost720.swf b/Minecraft.Assets/Common/Media/SocialPost720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPost720.swf
rename to Minecraft.Assets/Common/Media/SocialPost720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPostSplit1080.swf b/Minecraft.Assets/Common/Media/SocialPostSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPostSplit1080.swf
rename to Minecraft.Assets/Common/Media/SocialPostSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPostSplit720.swf b/Minecraft.Assets/Common/Media/SocialPostSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPostSplit720.swf
rename to Minecraft.Assets/Common/Media/SocialPostSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/SocialPostVita.swf b/Minecraft.Assets/Common/Media/SocialPostVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/SocialPostVita.swf
rename to Minecraft.Assets/Common/Media/SocialPostVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/Timer1080.swf b/Minecraft.Assets/Common/Media/Timer1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/Timer1080.swf
rename to Minecraft.Assets/Common/Media/Timer1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/Timer480.swf b/Minecraft.Assets/Common/Media/Timer480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/Timer480.swf
rename to Minecraft.Assets/Common/Media/Timer480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/Timer720.swf b/Minecraft.Assets/Common/Media/Timer720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/Timer720.swf
rename to Minecraft.Assets/Common/Media/Timer720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TimerSplit1080.swf b/Minecraft.Assets/Common/Media/TimerSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TimerSplit1080.swf
rename to Minecraft.Assets/Common/Media/TimerSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TimerSplit720.swf b/Minecraft.Assets/Common/Media/TimerSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TimerSplit720.swf
rename to Minecraft.Assets/Common/Media/TimerSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TimerVita.swf b/Minecraft.Assets/Common/Media/TimerVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TimerVita.swf
rename to Minecraft.Assets/Common/Media/TimerVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTips1080.swf b/Minecraft.Assets/Common/Media/ToolTips1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTips1080.swf
rename to Minecraft.Assets/Common/Media/ToolTips1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTips480.swf b/Minecraft.Assets/Common/Media/ToolTips480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTips480.swf
rename to Minecraft.Assets/Common/Media/ToolTips480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTips720.swf b/Minecraft.Assets/Common/Media/ToolTips720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTips720.swf
rename to Minecraft.Assets/Common/Media/ToolTips720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTipsSplit1080.swf b/Minecraft.Assets/Common/Media/ToolTipsSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTipsSplit1080.swf
rename to Minecraft.Assets/Common/Media/ToolTipsSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTipsSplit720.swf b/Minecraft.Assets/Common/Media/ToolTipsSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTipsSplit720.swf
rename to Minecraft.Assets/Common/Media/ToolTipsSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/ToolTipsVita.swf b/Minecraft.Assets/Common/Media/ToolTipsVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/ToolTipsVita.swf
rename to Minecraft.Assets/Common/Media/ToolTipsVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenu1080.swf b/Minecraft.Assets/Common/Media/TradingMenu1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenu1080.swf
rename to Minecraft.Assets/Common/Media/TradingMenu1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenu480.swf b/Minecraft.Assets/Common/Media/TradingMenu480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenu480.swf
rename to Minecraft.Assets/Common/Media/TradingMenu480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenu720.swf b/Minecraft.Assets/Common/Media/TradingMenu720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenu720.swf
rename to Minecraft.Assets/Common/Media/TradingMenu720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenuSplit1080.swf b/Minecraft.Assets/Common/Media/TradingMenuSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenuSplit1080.swf
rename to Minecraft.Assets/Common/Media/TradingMenuSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenuSplit720.swf b/Minecraft.Assets/Common/Media/TradingMenuSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenuSplit720.swf
rename to Minecraft.Assets/Common/Media/TradingMenuSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TradingMenuVita.swf b/Minecraft.Assets/Common/Media/TradingMenuVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TradingMenuVita.swf
rename to Minecraft.Assets/Common/Media/TradingMenuVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TrialExitUpsell480.swf b/Minecraft.Assets/Common/Media/TrialExitUpsell480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TrialExitUpsell480.swf
rename to Minecraft.Assets/Common/Media/TrialExitUpsell480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TrialExitUpsell720.swf b/Minecraft.Assets/Common/Media/TrialExitUpsell720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TrialExitUpsell720.swf
rename to Minecraft.Assets/Common/Media/TrialExitUpsell720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup1080.swf b/Minecraft.Assets/Common/Media/TutorialPopup1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup1080.swf
rename to Minecraft.Assets/Common/Media/TutorialPopup1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup480.swf b/Minecraft.Assets/Common/Media/TutorialPopup480.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup480.swf
rename to Minecraft.Assets/Common/Media/TutorialPopup480.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup720.swf b/Minecraft.Assets/Common/Media/TutorialPopup720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopup720.swf
rename to Minecraft.Assets/Common/Media/TutorialPopup720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupSplit1080.swf b/Minecraft.Assets/Common/Media/TutorialPopupSplit1080.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupSplit1080.swf
rename to Minecraft.Assets/Common/Media/TutorialPopupSplit1080.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupSplit720.swf b/Minecraft.Assets/Common/Media/TutorialPopupSplit720.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupSplit720.swf
rename to Minecraft.Assets/Common/Media/TutorialPopupSplit720.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupVita.swf b/Minecraft.Assets/Common/Media/TutorialPopupVita.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/TutorialPopupVita.swf
rename to Minecraft.Assets/Common/Media/TutorialPopupVita.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skin.swf b/Minecraft.Assets/Common/Media/skin.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skin.swf
rename to Minecraft.Assets/Common/Media/skin.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinGraphics.swf b/Minecraft.Assets/Common/Media/skinGraphics.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinGraphics.swf
rename to Minecraft.Assets/Common/Media/skinGraphics.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsHud.swf b/Minecraft.Assets/Common/Media/skinGraphicsHud.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsHud.swf
rename to Minecraft.Assets/Common/Media/skinGraphicsHud.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsInGame.swf b/Minecraft.Assets/Common/Media/skinGraphicsInGame.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsInGame.swf
rename to Minecraft.Assets/Common/Media/skinGraphicsInGame.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsLabels.swf b/Minecraft.Assets/Common/Media/skinGraphicsLabels.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinGraphicsLabels.swf
rename to Minecraft.Assets/Common/Media/skinGraphicsLabels.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHD.swf b/Minecraft.Assets/Common/Media/skinHD.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHD.swf
rename to Minecraft.Assets/Common/Media/skinHD.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphics.swf b/Minecraft.Assets/Common/Media/skinHDGraphics.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphics.swf
rename to Minecraft.Assets/Common/Media/skinHDGraphics.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsHud.swf b/Minecraft.Assets/Common/Media/skinHDGraphicsHud.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsHud.swf
rename to Minecraft.Assets/Common/Media/skinHDGraphicsHud.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsInGame.swf b/Minecraft.Assets/Common/Media/skinHDGraphicsInGame.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsInGame.swf
rename to Minecraft.Assets/Common/Media/skinHDGraphicsInGame.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsLabels.swf b/Minecraft.Assets/Common/Media/skinHDGraphicsLabels.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDGraphicsLabels.swf
rename to Minecraft.Assets/Common/Media/skinHDGraphicsLabels.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDHud.swf b/Minecraft.Assets/Common/Media/skinHDHud.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDHud.swf
rename to Minecraft.Assets/Common/Media/skinHDHud.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDInGame.swf b/Minecraft.Assets/Common/Media/skinHDInGame.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDInGame.swf
rename to Minecraft.Assets/Common/Media/skinHDInGame.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHDLabels.swf b/Minecraft.Assets/Common/Media/skinHDLabels.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHDLabels.swf
rename to Minecraft.Assets/Common/Media/skinHDLabels.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinHud.swf b/Minecraft.Assets/Common/Media/skinHud.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinHud.swf
rename to Minecraft.Assets/Common/Media/skinHud.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinInGame.swf b/Minecraft.Assets/Common/Media/skinInGame.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinInGame.swf
rename to Minecraft.Assets/Common/Media/skinInGame.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/skinLabels.swf b/Minecraft.Assets/Common/Media/skinLabels.swf
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/skinLabels.swf
rename to Minecraft.Assets/Common/Media/skinLabels.swf
diff --git a/Minecraft.Assets/XboxMedia/Common/Media/splashes.txt b/Minecraft.Assets/Common/Media/splashes.txt
similarity index 100%
rename from Minecraft.Assets/XboxMedia/Common/Media/splashes.txt
rename to Minecraft.Assets/Common/Media/splashes.txt