rearrange directories and update with missing files