Removed Core, Refactored SignIn and Storage