Clean up

This commit cleans up the Server and Client files. It is also ready to
accept bigger update like sending files.