Feature/indicator service refactor 2

Feel pretty iffy about all of these being in an 'indicator' folder when there is already an indicators folder. Thoughts on other names for these two?