Move to individual directory. Update chap2