Minor update to finish file organization.