Changed program build structure