Moved back support code from external packages to single support project.