Remove thingatpt
Split into separate files
Fixes and lexical binding