Better organization, more object oriented