Pre embed restructure commit