Reorganize Keystone task