cleanup step 1
clean file structure step 2