Commit b0666fd

@@ -5,7 +5,7 @@ module Saml
     # This module is responsible for
     # generating converting templates to xml.
     module XmlTemplatable
-      TEMPLATES_DIR = Pathname.new(File.join(__dir__, 'builders/templates/'))
+      TEMPLATES_DIR = Pathname.new(File.join(__dir__, '../builders/templates/'))
       include ::Xml::Kit::Templatable
 
       def template_path

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'saml/kit/xml_templatable'
 require 'saml/kit/builders/assertion'
 require 'saml/kit/builders/authentication_request'
 require 'saml/kit/builders/encrypted_assertion'

@@ -17,15 +17,17 @@ require 'securerandom'
 require 'uri'
 require 'xml/kit'
 
-require 'saml/kit/buildable'
+require 'saml/kit/concerns/buildable'
+require 'saml/kit/concerns/requestable'
+require 'saml/kit/concerns/respondable'
+require 'saml/kit/concerns/serializable'
+require 'saml/kit/concerns/translatable'
+require 'saml/kit/concerns/trustable'
+require 'saml/kit/concerns/xml_templatable'
+require 'saml/kit/concerns/xsd_validatable'
+
 require 'saml/kit/builders'
 require 'saml/kit/namespaces'
-require 'saml/kit/serializable'
-require 'saml/kit/xsd_validatable'
-require 'saml/kit/respondable'
-require 'saml/kit/requestable'
-require 'saml/kit/trustable'
-require 'saml/kit/translatable'
 require 'saml/kit/document'
 
 require 'saml/kit/assertion'