Refactored helper classes into separate files