modifying source into folders ( more organized  )