Index: trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/Ebnf.xtext
===================================================================
--- trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/Ebnf.xtext	(revision 11)
+++ trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/Ebnf.xtext	(revision 13)
@@ -11,19 +11,34 @@
 	'grammar' name=ID
 	(	type='/bnf'? ';' 
-		(imports+=Import)* 
-		(rule+=Rule | sectionheader+=SectionHeading)+ 
+		(importSection=ImportSection)?
+		(bnfEntry+=BnfEntry)+ 
 	)
 	| 
 	(	type='/delta' ';'
-		(imports+=Import)* 
-		(rule+=Rule | sectionheader+=SectionHeading | extRule+=ExtRule)*
+		(importSection=ImportSection)?
+		(deltaEntry+=DeltaEntry)*
 	)
 	| 
 	(	type='/merge' ';' 
-		(imports+=Import)* 
-		(sectionheader+=SectionHeading | mergeRule+=MergeRule)* 
+		(importSection=ImportSection)?
+		(mergeEntry+=MergeEntry)* 
 	)
 ;
 
+ImportSection:
+	(imports+=Import)+
+;
+
+BnfEntry:
+	sectionheader=SectionHeading | rule=Rule
+;
+
+DeltaEntry:
+	rule=Rule | sectionheader=SectionHeading | extRule=ExtRule
+;
+
+MergeEntry:
+	sectionheader=SectionHeading | mergeRule=MergeRule
+;
 
 SectionHeading: