#131 Move ExpiryPolicy and its inner classes to a package. Move Duration to that package.
Merge remote-tracking branch 'origin/master'