Major new source refactoring.