Reorg For Clarity

This leaves the .services package with only the "Start" classes so it's clearly the entry point and has the implementation details all inside impls.