moved server directory back into root and modified Makefile to add postgresql utilities