Class path and build properties refatorisation