Refactor for different sources
Merge pull request #1 from invisiblefunnel/civic-data

Refactor for different sources