more reorganizing to prepare for mobile map layout work in dev