Refactored prepared service registrations and moved to Deck/Container.
Lots of unit testing.