refactoring of createBuildWithFor:
added missing files