restructuring author directory, adding author
fixing merge conflict
fixing bulk conversion errors