- moved code around
 - changed the SecurityServiceManager class to not be a singleton anymore