Added User class
Changes to existing files