Moved chapters around and adjusted text appropriately