Revert "Client's refacturing - Phase 2."

This reverts commit 8fc89c1b730297bc6f4cbbb2bd5704f6c9876589.
add boost library