Refactor folder structure. Add multiple files
Move files to correct directories.