part 2 mostly finished and moved folder