re-org now includes clients also - builds :)