Amending commit to OOZIE-1217 by moving packages

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1446809 13f79535-47bb-0310-9956-ffa450edef68