move code from addr to Lib, adapt TypeOf and Cplt
more in README