Continued, massive renaming and reorg refactoring.