rewrite of contributors

Change-Id: Ia7acb6b2dc92755b2224688f79898cbcbce6dbd9