Fix a few missed references for servers=>modules
fix some renamed tags
Merge pull request #2 from mattstep/master

Servers => Modules