Separating responsibilities of included modules.
Creating a proper class for the noun reader.
Further separation of concerns.
Merge pull request #2 from rhyolight/refactorings

Refactorings