diff --git a/_src/_data/founders.yml b/_src/_data/founders.yml
deleted file mode 100644
index 23ea1b6..0000000
--- a/_src/_data/founders.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- name: Bruce Pon
- position: CEO
- image: team-bruce.jpg
- twitter: BrucePon
- linkedin: ponbruce
- bio: "Bruce Pon is the CEO and co-founder of BigchainDB. Prior to BigchainDB, Bruce co-founded Avantalion International Consulting, a consulting firm specialized in building banks and industry startups in Europe and Asia for companies such as Mercedes-Benz, Volkswagen, Mitsubishi. Bruce is a board member, advisor and investor in six startups. He has an Advanced Executive Certificate from MIT Sloan and a B.Sc in Engineering from the University of Saskatchewan."
-
-- name: Trent McConaghy
- position: CTO
- image: team-trent.jpg
- twitter: trentmc0
- facebook: trent.mcconaghy
- linkedin: trentmc
- github: trentmc
- bio: "Trent McConaghy has 15 years of deep technology experience with a focus on machine learning, data visualization and user experience. He was a researcher at the Canadian Department of Defense and in 1999, he co-founded Analog Design Automation Inc. and was its CTO until its acquisition by Synopsys Inc. In 2004, he co-founded Solido Design Automation Inc., once again in the role of CTO. Trent has written two critically acclaimed books on machine learning, creativity and circuit design and has authored or co-authored more than 40 papers and patents. Trent has a PhD in Engineering from KU Leuven, Belgium and Bachelor’s degrees in Engineering and in Computer Science from the University of Saskatchewan where he won awards for the top PhD thesis and top undergraduate thesis."
-
-- name: Masha McConaghy
- position: CMO
- image: team-masha.jpg
- linkedin: mashamc
- bio: "Masha McConaghy, curator and researcher, is a co-founder and CMO at BigchainDB and ascribe.io, a service enabling immutable attribution for artists and clear provenance for digital and physical art. She has a PhD in Arts from Pantheon-Sorbonne University, Paris and a Museology Degree from Louvre School, Paris. She has organized exhibitions throughout the world and has worked with curators at the Louvre Museum in Paris and directed a commercial gallery in Vancouver. Her current pursuits are at the intersection of art, IP and applications of new technology."
diff --git a/_src/_data/team.yml b/_src/_data/team.yml
index 3b2e830..d1284fd 100644
--- a/_src/_data/team.yml
+++ b/_src/_data/team.yml
@@ -1,86 +1,110 @@
+founders:
+ - name: Bruce Pon
+ position: CEO
+ image: team-bruce.jpg
+ twitter: BrucePon
+ linkedin: ponbruce
+ bio: "Bruce Pon is the CEO and co-founder of BigchainDB. Prior to BigchainDB, Bruce co-founded Avantalion International Consulting, a consulting firm specialized in building banks and industry startups in Europe and Asia for companies such as Mercedes-Benz, Volkswagen, Mitsubishi. Bruce is a board member, advisor and investor in six startups. He has an Advanced Executive Certificate from MIT Sloan and a B.Sc in Engineering from the University of Saskatchewan."
-- name: Daniel Lustig
- position: Administrative Assistant
- image: team-daniel.jpg
- linkedin: daniel-lustig-852a408a
+ - name: Trent McConaghy
+ position: CTO
+ image: team-trent.jpg
+ twitter: trentmc0
+ facebook: trent.mcconaghy
+ linkedin: trentmc
+ github: trentmc
+ bio: "Trent McConaghy has 15 years of deep technology experience with a focus on machine learning, data visualization and user experience. He was a researcher at the Canadian Department of Defense and in 1999, he co-founded Analog Design Automation Inc. and was its CTO until its acquisition by Synopsys Inc. In 2004, he co-founded Solido Design Automation Inc., once again in the role of CTO. Trent has written two critically acclaimed books on machine learning, creativity and circuit design and has authored or co-authored more than 40 papers and patents. Trent has a PhD in Engineering from KU Leuven, Belgium and Bachelor’s degrees in Engineering and in Computer Science from the University of Saskatchewan where he won awards for the top PhD thesis and top undergraduate thesis."
-- name: Krish Iyer
- position: Developer
- image: team-krish.jpg
- twitter: krish7919
- linkedin: krish7919
- github: krish7919
+ - name: Masha McConaghy
+ position: CMO
+ image: team-masha.jpg
+ linkedin: mashamc
+ bio: "Masha McConaghy, curator and researcher, is a co-founder and CMO at BigchainDB and ascribe.io, a service enabling immutable attribution for artists and clear provenance for digital and physical art. She has a PhD in Arts from Pantheon-Sorbonne University, Paris and a Museology Degree from Louvre School, Paris. She has organized exhibitions throughout the world and has worked with curators at the Louvre Museum in Paris and directed a commercial gallery in Vancouver. Her current pursuits are at the intersection of art, IP and applications of new technology."
-- name: Simon Schwerin
- position: Strategy & Business Development Intern
- image: team-simon.jpg
- twitter: Zimmtstern_7
- linkedin: simonschwerin
-- name: Alberto Granzotto
- position: Developer
- image: team-alberto.jpg
- twitter: vrde
- github: vrde
+team:
+ - name: Daniel Lustig
+ position: Administrative Assistant
+ image: team-daniel.jpg
+ linkedin: daniel-lustig-852a408a
-- name: Rodolphe Marques
- position: Protocols
- image: team-rodolphe.jpg
- twitter: rodmar_
- github: r-marques
- linkedin: rodolphemarques
+ - name: Krish Iyer
+ position: Developer
+ image: team-krish.jpg
+ twitter: krish7919
+ linkedin: krish7919
+ github: krish7919
-- name: Greg McMullen
- position: CPO
- image: team-greg.jpg
- twitter: gmcmullen
- linkedin: gregmcm
+ - name: Simon Schwerin
+ position: Strategy & Business Development Intern
+ image: team-simon.jpg
+ twitter: Zimmtstern_7
+ linkedin: simonschwerin
-- name: Dimitri de Jonghe
- position: Application Director
- image: team-dimitri.jpg
- twitter: DimitriDeJonghe
- facebook: dimitri.jonghe
- github: diminator
- linkedin: dimitridejonghe
+ - name: Alberto Granzotto
+ position: Developer
+ image: team-alberto.jpg
+ twitter: vrde
+ github: vrde
-- name: Carly Sheridan
- position: Director of Marketing and Communications
- image: team-carly.jpg
- twitter: _carlynoelle
- linkedin: carlysheridan
+ - name: Rodolphe Marques
+ position: Protocols
+ image: team-rodolphe.jpg
+ twitter: rodmar_
+ github: r-marques
+ linkedin: rodolphemarques
-- name: Troy McConaghy
- position: Developer
- image: team-troy.jpg
- twitter: TroyMc
+ - name: Greg McMullen
+ position: CPO
+ image: team-greg.jpg
+ twitter: gmcmullen
+ linkedin: gregmcm
-- name: Wojciech Hupert
- position: UX / UI Designer
- image: team-wojciech.jpg
- twitter: WojciechHupert
- linkedin: wojciechhupert
+ - name: Dimitri de Jonghe
+ position: Application Director
+ image: team-dimitri.jpg
+ twitter: DimitriDeJonghe
+ facebook: dimitri.jonghe
+ github: diminator
+ linkedin: dimitridejonghe
-- name: Kasia Kazimierczak
- position: Operations Manager
- image: team-kasia.jpg
- linkedin: katarzyna-kazimierczak
+ - name: Carly Sheridan
+ position: Director of Marketing and Communications
+ image: team-carly.jpg
+ twitter: _carlynoelle
+ linkedin: carlysheridan
-- name: Sylvain Bellemare
- position: Developer
- image: team-sylvain.jpg
- twitter: sbellem
- facebook: slvnb
- github: sbellem
- linkedin: sylvainbellemare
+ - name: Troy McConaghy
+ position: Developer
+ image: team-troy.jpg
+ twitter: TroyMc
-- name: Tim Daubenschütz
- position: Product Manager
- image: team-tim.jpg
- twitter: TimDaub
- github: TimDaub
+ - name: Wojciech Hupert
+ position: UX / UI Designer
+ image: team-wojciech.jpg
+ twitter: WojciechHupert
+ linkedin: wojciechhupert
-- name: Wrigley the Buffalo
- position: Community Manager
- image: nosprite/wrigley-avatar.svg
- github: wrigley
+ - name: Kasia Kazimierczak
+ position: Operations Manager
+ image: team-kasia.jpg
+ linkedin: katarzyna-kazimierczak
+
+ - name: Sylvain Bellemare
+ position: Developer
+ image: team-sylvain.jpg
+ twitter: sbellem
+ facebook: slvnb
+ github: sbellem
+ linkedin: sylvainbellemare
+
+ - name: Tim Daubenschütz
+ position: Product Manager
+ image: team-tim.jpg
+ twitter: TimDaub
+ github: TimDaub
+
+ - name: Wrigley the Buffalo
+ position: Community Manager
+ image: nosprite/wrigley-avatar.svg
+ github: wrigley
diff --git a/_src/_includes/founders.html b/_src/_includes/founders.html
deleted file mode 100644
index 3becee4..0000000
--- a/_src/_includes/founders.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- {% assign founders = site.data.founders %}
-
- {% for member in founders %}
-
-