Renamed stuff, and add infrastructure
Merge branch 'master' of https://github.com/JERlabs/JERney