NXP-9602: Reorganize files