import cleanup
Fixes #15
import cleanup
Move MessageLinkSpan to proper package
Fixes #12
Fixes #13