Edit all sources to make them more easily reusable.
Merge branch 'feature/dynamic-urls' into develop