minor L2VillageMaster refactor
another batch of refactoring
more refactoring...