Move both service and web-client back into a single module for simplicity