Some structural changes
Merge branch 'master' of https://github.com/alexdantas/terminus