Added Service.cpp .h and changes for Makefile