Reorganized client code into .helpers groups