Some modules cannot be disabled - we should respect that.
Also moved some stuff around.