Restructure pillars, following Chippery