Refactoring eval
Add Lens to cabal definition