Files re-arrangments