reorganized and added all articles
merge conflicts