Build reorganization to keep build number off git