Revert "Use correct subdir for client, buid daemon by default and make"

This reverts commit 67548aa13fb99fb362cb88821406634000e655ef.