Renamed MartketPlace and MarketPlaceController
For consistency, MarketPlace is now MarketScreen, and MarketPlaceController is MarketScreenController.