Add lift-types.*pp
Type extraction can safely happen before AST annotation
Fix include
Add lift types module, move modules around to match dependency order