Reorganize elements into extension and add .article.list