restructured structure
renamed Helper class