Instantiate the right service after POST request, rename/move modules