Move nextgen code to mvstar2 branch.