renamed some chapters and moved stuff around to reflect current plan