Re-arranged chapters and file titles