Refactored construction of objects into a "construction yard" class.
Refactored some stuff back into Services