Refactoring of Naru projects.