Changed package structure and build.xml