resolve user/group variable naming conflict
restructure