Map source issue #483

I've added Cadair's proposed folder structure in this branch. Also removed map/sources from this branch.