Move layer and map construction into their dependent services