Restructuring in com.company.helper