Remove useless DEBUG setting
Reorganise modules