Refactor project in order to make it more object oriented