--- trunk/libxmltv/Core/XMLTV_CONSTANTS.cs	2013/03/07 11:08:48	23
+++ trunk/libxmltv/Core/XMLTVConstants.cs	2013/03/10 12:25:54	106
@@ -5,11 +5,56 @@
 
 namespace libxmltv.Core
 {
-    public class XMLTV_CONSTANTS
+    public static class XMLTVConstants
     {
-        public const string ROOT_ELEMENT = "tv";
-        public const string CHANNEL_ELEMENT = "channel";
-        public const string PROGRAM_ELEMENT = "programme";
+        #region Root Constants
+        public static class Root
+        {
+            public const string RootElement = "tv";
+        }
+        #endregion
+
+        #region Source Constants
+        public static class Source
+        {
+            public const string SourceName = "source-info-name";
+            public const string GeneratorName = "generator-info-name";
+            public const string GeneratorUrl = "generator-info-url";
+        }
+        #endregion
+        #region Channel Constants
+        public static class Channels
+        {
+            public const string RootElement = "channel";
+            public const string ChannelId = "id";
+            public const string ChannelDisplayName = "display-name";
+        }
+        #endregion
+        #region Program Constants
+        public static class Programs
+        {
+            public const string RootElement = "programme";
+            public const string ProgramStart = "start";
+            public const string ProgramStop = "stop";
+            public const string ProgramChannelId = XMLTVConstants.Channels.RootElement;
+            public const string ProgramTitle = "title";
+            public const string ProgramSubTitle = "sub-title";
+            public const string ProgramDescription = "desc";
+
+            #region extra meta-data
+            //public const string ProgramCredits = "credits";
+            //public const string ProgramDirector = "director";
+            //public const string ProgramActor = "actor";
+            //public const string ProgramDate = "date";
+            //public const string ProgramCategory = "category";
+            //public const string ProgramEpisodeNum = "episode-num";
+            //public const string ProgramPreviouslyShown = "previously-shown";
+            public const string ProgramExtraMetaData = "extras";
+            #endregion
+        }
+        #endregion
     }
 }
 
+
+