added independent directory capability for role files
Fixed bugs in same
updated tests
Separated clear keep role from clear keep data as sometimes don't want to clear role