Reorganize flie structure