Rework files structure.