Main class updated and renamed. Minor checkstyle fixes. Removed privacy
breaching methods in the model.