Remove unneeded package includes.
Remove *.orig file.
Move filing testing helpers to opengever.core.testing.
Cleanup configuration file.
Improve naming.