Update: type, individual contributions, restructure

Needs more cowbell!