Moved stuff around, changed relation type names, added Author