refactoring and GET files updated
refactoring
making utility file and refactoring