I have the begun tidying up the files to create one package. This first
stage involves making sure the I/O is correct in all the files.