Changes to module structure / decoupling from the webservices module