pulled bap_types
Moved our stuff to *.in files, addressed issues.
merge