removed rinari
added some new modules