Make type variable consistent
Fix cabal file layout
Clean up cabal file
Kill dependency on lens