Refactor structure creating an utility folder and added comments