Refactor

Still not done but I want to get the database changes for the author book relationship merged into master. All of our branches require a different database schema.