New config loader
Reordered the module hooks
Cleaned up the config files