Move Endpoint to stream package
Reorganize monitors section.