Small code cleanup

Moved the Unsubscriber class to its own file.