Reorganize namespaces to let links to kotlin source Just Work