Refactoring: changed package name and added Getters, Setters in Case class