edit: reorganize files