Moved some more client files.
Removed files from a previous path.
Updated the Makefile so that it works with the new organization of files/dirs.