Consolidated var declarations and added properties in www/build.xml for build and dist dirs