Files re-arrangement