refactoring and renaming helper files