Coupling Updates - Refactoring into individual modules

Fixes to Graphite Middleware