[development] Split module into two?