dev/luke -- refactor a bit and reorganize the utilities#1

lukedeo wants to merge 2 commits intomastertextclf/data-handler:masterfrom

dev/luketextclf/data-handler:dev/lukeCopy head branch name to clipboard