Changed the architecture of classes designed to calculate the area