Make assistants subdirs named the same as roles to be consistent