restructured the client project portion, now uses jam