Moved our stuff to *.in files, addressed issues.