fixed module order bug and changed router