Made helper package
Fixed Merge conflict