Renamed the Article class. This commit also includes some minor bugfixes.