Refactored and organized the class files