refactoring, renaming of files & functions