Refactor namespace for WordDiary