Removed funcBuilder files and added adaptor files.