Resolved #258: removed funcBuilder files and added adaptor files.