cleanup script
reordering folder structure