Move all options associated with places out of the places file