Removed funcBuilder files and added adaptor files.
Merge branch `adaptor` into `master`.