Move keys.feature to the right place