Fixes stupid problem of using break where I want continue
Improves logging around interrupt calls.
Reorganises the packages a bit to separate the data objects from the tasks.