Small changes in the ArticleModule and some general refactorings.