Refactor classes

Created custom classes to make code reusable.