Move around models to fix Author not found