Loosened coupling by placing handlers in separate package.
Loosened coupling.
Cleaned.