new structure
Merge https://github.com/felixschaumann/JemLine