Reorganized files.  Updated readme