added getters and setters, and change model structure of the application