cleaned file structure step 2