Updated docs to reflect stuff that's been relocated to different modules
Don't set things up for a later NPE with no traceable cause