Big reorganisation
Fixes #2
Fixes #3
Fixes #4
Fixes #5
/cc @Gulfa