Comment anchors.
Moved handlers out into separate packages and added comments.