Refactor/redirector

Closes #94