file restructure part 2