Tidied up load sequence, removed some circular dependencies