Fixed build.xml
Changed to org packaging