refactoring
refactoring
refactoring
refactoring
refactoring and renaming some scripts