Feature/indicator service refactor 2

Really dislike this module name, where it is in the source tree, but couldn't come up with anything better. Thoughts?