changed build structure