redesign classes for reusability #8

Closed peanutsee closed 3 weeks ago