Move abandoned modules from main kochira repo.
Update for latest kochira.