mogami: reorganize files