phase 1 file restructure