Updated general structure and added BibExport