structural changes and add contributors