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