reorganize files structure