Renamed Datepicker to DatePicker - added skeleton for MapPicker