minor refactoring and renaming of files
minor refactoring