Rebuilding build structure for Deuterium Use