Keystore moved to system/security