More major changes

- moved logic from service functions to modules that call the service functions.

Signed-off-by: Robert Tipton <tret@tretflix.com>