Moving keystone to three modules