Add the thesis infrastructure to the BEq code
Code with thesis structure WORKING
fixing merge error