Added Model and Service layers