Final deletions to rearrange file structure