removed old service-stub modules
added new modules