refactoring names of files and folders
Removed old files after refactor