build.xml modified creates proper structure