Exclude map and client lib directory
Merged wip branch