lib/openehr.rb in openehr-1.2.8 vs lib/openehr.rb in openehr-1.2.9

@@ -1,14 +1,13 @@
-require 'openehr/version'
-require 'openehr/assumed_library_types'
-require 'openehr/rm'
-require 'openehr/am'
-require 'openehr/parser'
-require 'openehr/serializer'
+require_relative 'openehr/version'
 
-module OpenEHR
-  include AssumedLibraryTypes
-  include RM
-  include AM
-  include Parser
-  include Serializer
-end
+#Reference model
+require_relative 'openehr/rm'
+
+#Archetype model
+require_relative 'openehr/am'
+
+#Adl/xml parser/serializer
+require_relative 'openehr/parser'
+require_relative 'openehr/parser/adl_parser'
+# require_relative 'openehr/parser/xml_parser'
+require_relative 'openehr/serializer'