Adjusted makefile for new file names, also moved TCP connection stuff into tcp.c