Version 1.9.1

Minor update to clean up file structure.