Refactoring the builder script and add a model for build.properties