Various code improvements
Move much of Wiki class to new Article class