Fix bug with organise directory when no config is present

Tests work locally but require a huge refactor to the suite to work
without manual intervention.

Ref #48