Split helper classes into separate files