Fixed the utility files issue and gitignore