(fix) reorganize files