diff --git a/lib/jsduck/meta_tag_loader.rb b/lib/jsduck/meta_tag_loader.rb
index 2fdaa8d584113cb3df6b3a8b0b1917a9d365dd25..385015b99e23babea7914b95dd44f95d72e3ac86 100644
--- a/lib/jsduck/meta_tag_loader.rb
+++ b/lib/jsduck/meta_tag_loader.rb
@@ -1,6 +1,6 @@
 require "jsduck/meta_tag"
-require 'jsduck/author_tag'
-require 'jsduck/doc_author_tag'
+require 'jsduck/tag/author'
+require 'jsduck/tag/docauthor'
 
 module JsDuck
 
diff --git a/lib/jsduck/author_tag.rb b/lib/jsduck/tag/author.rb
similarity index 71%
rename from lib/jsduck/author_tag.rb
rename to lib/jsduck/tag/author.rb
index 390ecb9c42fa1ff00af4a196a8c2325af02fddbf..c345ff8bb6bac720dcef92fb73232b78684e684d 100644
--- a/lib/jsduck/author_tag.rb
+++ b/lib/jsduck/tag/author.rb
@@ -1,8 +1,8 @@
 require "jsduck/meta_tag"
 
-module JsDuck
+module JsDuck::Tag
   # Implementation of hidden @author tag
-  class AuthorTag < MetaTag
+  class Author < JsDuck::MetaTag
     def initialize
       @name = "author"
     end
diff --git a/lib/jsduck/doc_author_tag.rb b/lib/jsduck/tag/docauthor.rb
similarity index 71%
rename from lib/jsduck/doc_author_tag.rb
rename to lib/jsduck/tag/docauthor.rb
index 5b5aaa7cbb871e4d65218fd86452ef8211e124d4..72967a9aea04ca061955a3b28f441da8ba40390c 100644
--- a/lib/jsduck/doc_author_tag.rb
+++ b/lib/jsduck/tag/docauthor.rb
@@ -1,8 +1,8 @@
 require "jsduck/meta_tag"
 
-module JsDuck
+module JsDuck::Tag
   # Implementation of hidden @docauthor tag
-  class DocAuthorTag < MetaTag
+  class Docauthor < JsDuck::MetaTag
     def initialize
       @name = "docauthor"
     end