Reorganize and expand Apache docs