Restructure load, adding some files not previous under revision control.