Update and rename model.java to Model.java