iCloud and Photos

Two things actually,

After the launch recently of Photos, it now appears I have two photo libraries, one for iPhoto and Photos, and they are not in Sync. I thought all previous pictures that were in iPhoto would have been migrated to Photos. Can the iPhoto library be simply imported into Photos in its entirety, and then the old iPhoto library deleted to save space and confusion?

Second point, I can no longer see my photo stream on my Mac, my other devices sync the stream photos ok, but they are not visible on my Mac. I initially had the library stored on iCloud, and then tried to save the photos to my Mac to see if this would solve the issue, but appears not.