slight reorganise of modules and initialization