ACCESS-7: Refactor code from com.cloudera to org.apache