Move expiration stuff to appropriate dir
Add required expiration trait
Add required expiration trait
Add expiration interfaces