Reshuffling naming, other langstruct nonsense
Merge branch 'master' of https://github.com/marksomnian/echode