Refactoring

A lot of refactoring after the new code came in. Some cleanup was in order.
Please note that there is a pull request in Services.bundle as well.

Cheer
Coil