Create a src dir, and a text dir for the text client.

Rework Makefile, fix includes, and move files to the right location.