Update to using arrays.
Update to remove extra files.