Extracted routes + cleanup
Merge pull request #6 from etna-bertra-n/master

Extracted routes + cleanup