Restructured keywords file