moves category impl to xacml lib
renames classes to remove redundant