Fixing serv Makefile to work with new submodule structure. Almost done