Revert "New submodule server-api-consumer"

This reverts commit f290abe3b288202d9b2682c9d6582d0889cabf18.