new nomenclature for client folder. closes #4