Hi! Good work. I have some feedback which might help you refactor this code to make it more flexible and less open to bugs appearing There is a lot of repeated/duplicate code in your if statement. Have you thought about creating a method which performs the move file code? The code above relies on the directories in file_folders dictionary existing. Have you thought about what would happen if those directories hadn't been created prior to the program running? The code above has the file_folder 'types' (documents, pictures, etc) hard coded in your if statement. Have you thought about creating a method that gets the key from the file extension? Do you need both the file_folder and file_type dictionaries, or can you turn them into a single dictionary? I personally would turn this into a Python class too, so that I can inject the file types, file folders and the path I'm moving files from into the class. Happy coding!