Internal files structure rearrangement