Restructured code to follow MVC pattern, Dropped the concept of password tokens and login tokens and rolled them into Token class, which now accepts a user Id and type Id