Couple of after-renaming fixes:
removed unneeded imports,
moved Configuration object,
introduced par2reducable
Merge pull request #8 from DarkDimius/topic/wip-renaming-fixes

Couple of after-renaming fixes