finally cleaning up folder structure