move files into ch6, ch7