Modify few files
Create the Util class, updated the App