issue #1758: updated build.xml for new folder structure.

issue #1758: updated build.xml for new folder structure.