moved keystone -> lib/keystone