Add links, restructure solution