first wave od deleting

Changing way of processing for folder based.