Review comment changes and update to org.apache packaging