Move factory methods to details classes
Make stop service use events
Add bus route service