Add a kotlin module as well
Migrate kotlin module to new, fun dir structure