Refactored: created new class files