Changes to update packages and restructure login