Improved build.properties

Further rework of build

Changes in build.properties