Reorganize files structure