Move services into Services module
PasswordStrategy should use config option