cleaned the file structure!