diff --git a/doc/grammar.txt b/doc/grammar.txt
new file mode 100644
index 00000000..5f6bdd53
--- /dev/null
+++ b/doc/grammar.txt
@@ -0,0 +1,49 @@
+CLI Syntax
+----------
+The CLI shall have a well-defined and unambiguous grammar.
+
+    timew start [<tagset>]
+    timew stop [<tagset>]
+    timew track [<interval>] [<tagset>]
+    timew [<filter>] report <report>
+
+
+CLI Grammar
+-----------
+
+  interval:  <timestamp> "-" <timestamp>
+             <timestamp> "to" <timestamp>
+             "from" <timestamp> "to" <timestamp>
+             "until" <timestamp>
+             "from" <timestamp>
+
+  timestamp: <day> <time>
+
+  month:     "january"
+             "february"
+             ...
+
+  day:       "monday"
+             "tuesday"
+             ...
+
+  time:      \d{4}
+             \d{1,2} ":" \d{2} <ampm>
+             \d{1,2} ":" \d{2}
+             \d{1,2} <ampm>
+             \d{1,2}
+
+  ampm:      "AM"
+             "am"
+             "a.m."
+             "PM"
+             "pm"
+             "p.m."
+
+  tagset:    <tag>+
+
+  tag:       string
+
+  string:    "\"" .+ "\""
+             .+
+
diff --git a/doc/notes.txt b/doc/notes.txt
index 810f144b..65b8c4ad 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -89,56 +89,6 @@ Example rules (assuming Python-like syntax):
   needs to be many of these, in order to make the rule system capable.
 
 
-CLI Syntax
-----------
-The CLI shall have a well-defined and unambiguous grammar.
-
-    timew start [<tagset>]
-    timew stop [<tagset>]
-    timew track [<interval>] [<tagset>]
-    timew [<filter>] report <report>
-
-
-CLI Grammar
------------
-
-  interval:  <timestamp> "-" <timestamp>
-             <timestamp> "to" <timestamp>
-             "from" <timestamp> "to" <timestamp>
-             "until" <timestamp>
-             "from" <timestamp>
-
-  timestamp: <day> <time>
-
-  month:     "january"
-             "february"
-             ...
-
-  day:       "monday"
-             "tuesday"
-             ...
-
-  time:      \d{4}
-             \d{1,2} ":" \d{2} <ampm>
-             \d{1,2} ":" \d{2}
-             \d{1,2} <ampm>
-             \d{1,2}
-
-  ampm:      "AM"
-             "am"
-             "a.m."
-             "PM"
-             "pm"
-             "p.m."
-
-  tagset:    <tag>+
-
-  tag:       string
-
-  string:    "\"" .+ "\""
-             .+
-
-
 Tags
 ----
 Tags represent tracking categories. Tags are arbitrary UTF8 strings. A tag may