Updating constructors and things for injection purposes
 - Refactored some service inclusions to prevent circular injection points