Changed the directory structure a little bit.
Also fixed the host name matching in client.