re-order the files construction