Moved MapDemo into demos/maps