Update and rename User.java to Users.java