Attempt to include bitap
Restructured keywords file