adopter criteria

combined adopter-adoptee list and adopter criteria into one directive
structure changes per issue #85