First major restructure. Remove references to articles.