Restructure njyy module