Restructure project, separtated reuseable utility, removed SMS utility
Merge with dev