Fold client into main module