Refactored module configuration, cleaned up a lot of modules, added client module