Correct load order
Refactor namespace structure