v2.1.6 .com/.net/.org contact change, refactoring