Refactoring filenames to organize into proper folders