Reworked the dependencies to DTE etc to be in separate services