head main and client moved in separate packages