Relocate helper classes to another package