Update upcoming: rearrange files