diff --git a/Gemfile b/Gemfile
index 0e4ce3edc..1d0899094 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,4 @@
-source "http://rubygems.org"
-gemspec
+source 'https://rubygems.org'
 
-group :test do
-  gem 'codeclimate-test-reporter', require: nil  
-  gem 'rubocop', '~> 0.43.0', require: false
-  gem 'simplecov'
-  gem 'minitest', "~> 4.0"
-  gem 'turn'
-  gem 'awesome_print', :require => 'ap'
-  gem 'nokogiri-diff'
-end
+# Specify your gem's dependencies in fhir_models.gemspec
+gemspec
diff --git a/Gemfile.old b/Gemfile.old
new file mode 100644
index 000000000..0e4ce3edc
--- /dev/null
+++ b/Gemfile.old
@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+gemspec
+
+group :test do
+  gem 'codeclimate-test-reporter', require: nil  
+  gem 'rubocop', '~> 0.43.0', require: false
+  gem 'simplecov'
+  gem 'minitest', "~> 4.0"
+  gem 'turn'
+  gem 'awesome_print', :require => 'ap'
+  gem 'nokogiri-diff'
+end
diff --git a/Rakefile b/Rakefile
index b03cc34c1..43022f711 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,31 +1,2 @@
-require 'rake'
-require 'rake/testtask'
-require 'fileutils'
-require 'pry'
-require 'rubocop/rake_task'
-
-require_relative 'lib/fhir_models'
-
-# Pull in any rake task defined in lib/tasks
-Dir['lib/tasks/**/*.rake'].sort.each do |ext|
-  load ext
-end
-
-desc "Run basic tests"
-Rake::TestTask.new(:test_unit) do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-  t.warning = false
-end
-
-desc 'Run rubocop'
-task :rubocop do
-  RuboCop::RakeTask.new
-end
-
-task test: [:test_unit, :rubocop] do
-  system('open coverage/index.html')
-end
-
-task default: [:test]
\ No newline at end of file
+require "bundler/gem_tasks"
+task :default => :spec
diff --git a/Rakefile.old b/Rakefile.old
new file mode 100644
index 000000000..b03cc34c1
--- /dev/null
+++ b/Rakefile.old
@@ -0,0 +1,31 @@
+require 'rake'
+require 'rake/testtask'
+require 'fileutils'
+require 'pry'
+require 'rubocop/rake_task'
+
+require_relative 'lib/fhir_models'
+
+# Pull in any rake task defined in lib/tasks
+Dir['lib/tasks/**/*.rake'].sort.each do |ext|
+  load ext
+end
+
+desc "Run basic tests"
+Rake::TestTask.new(:test_unit) do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+  t.warning = false
+end
+
+desc 'Run rubocop'
+task :rubocop do
+  RuboCop::RakeTask.new
+end
+
+task test: [:test_unit, :rubocop] do
+  system('open coverage/index.html')
+end
+
+task default: [:test]
\ No newline at end of file
diff --git a/bin/console b/bin/console
new file mode 100755
index 000000000..6adf966f7
--- /dev/null
+++ b/bin/console
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "fhir_models"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..dce67d860
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here
diff --git a/fhir_models.gemspec b/fhir_models.gemspec
index 1def91660..eff6b5f0b 100644
--- a/fhir_models.gemspec
+++ b/fhir_models.gemspec
@@ -1,20 +1,35 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fhir_models/version'
 
-Gem::Specification.new do |s|
-  s.name = "fhir_models"
-  s.summary = "A Gem for handling FHIR models in ruby"
-  s.description = "A Gem for handling FHIR models in ruby"
-  s.email = "jwalonoski@mitre.org"
-  s.homepage = "https://github.com/fhir-crucible/fhir_models"
-  s.authors = ["Jason Walonoski", "Andre Quina", "Michael O'Keefe"]
-  s.version = '1.6.3'
-  s.files = s.files = `git ls-files`.split("\n")
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'test-unit'
-  s.add_dependency 'rake', '>= 0.8.7'
-  s.add_dependency 'nokogiri', '>= 1.6'
-  s.add_dependency 'date_time_precision', '>= 0.8'
-  s.add_dependency 'bcp47', '>= 0.3'
-  s.add_dependency 'mime-types', '>= 1.16', '< 3'
+Gem::Specification.new do |spec|
+  spec.name          = "fhir_models"
+  spec.version       = FHIR::Models::VERSION
+  spec.authors       = ["Jason Walonoski", "Andre Quina", "Michael O'Keefe"]
+  spec.email         = ["jwalonoski@mitre.org"]
+
+  spec.summary       = %q{A Gem for handling FHIR models in ruby}
+  spec.description   = %q{A Gem for handling FHIR models in ruby}
+  spec.homepage      = "https://github.com/fhir-crucible/fhir_models"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'nokogiri', '>= 1.6'
+  spec.add_dependency 'date_time_precision', ">= 0.8"
+  spec.add_dependency 'bcp47', '>= 0.3'
+  spec.add_dependency 'mime-types', '>= 1.16', '< 3'
+
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "nokogiri-diff"
+  spec.add_development_dependency "rubocop", '~> 0.43.0'
 end
diff --git a/lib/fhir_models.old.rb b/lib/fhir_models.old.rb
new file mode 100644
index 000000000..6004bdb99
--- /dev/null
+++ b/lib/fhir_models.old.rb
@@ -0,0 +1,44 @@
+# Top level include file that brings in all the necessary code
+require 'bundler/setup'
+require 'yaml'
+require 'nokogiri'
+require 'date_time_precision'
+require 'date_time_precision/format/iso8601'
+require 'mime/types'
+require 'bcp47'
+require 'bigdecimal'
+require 'logger'
+require 'tempfile'
+
+root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
+
+# Need to require Hashable first
+require File.join(root,'lib','bootstrap','hashable.rb')
+require File.join(root,'lib','bootstrap','json.rb')
+
+Dir.glob(File.join(root, 'lib','bootstrap','*.rb')).each do |file|
+  require file
+end
+Dir.glob(File.join(root, 'lib','bootstrap','**','*.rb')).each do |file|
+  require file
+end
+
+require File.join(root, 'lib','fhir.rb')
+
+# Require the generated code
+Dir.glob(File.join(root, 'lib','fhir','*.rb')).each do |file|
+  require file
+end
+Dir.glob(File.join(root, 'lib','fhir','**','*.rb')).each do |file|
+  require file
+end
+
+# Require the fluentpath code
+Dir.glob(File.join(root, 'lib','fluentpath','*.rb')).each do |file|
+  require file
+end
+
+# Require the fhir_ext code
+Dir.glob(File.join(root, 'lib','fhir_ext','*.rb')).each do |file|
+  require file
+end
diff --git a/lib/fhir_models.rb b/lib/fhir_models.rb
index 6004bdb99..5c8c072bc 100644
--- a/lib/fhir_models.rb
+++ b/lib/fhir_models.rb
@@ -1,44 +1,5 @@
-# Top level include file that brings in all the necessary code
-require 'bundler/setup'
-require 'yaml'
-require 'nokogiri'
-require 'date_time_precision'
-require 'date_time_precision/format/iso8601'
-require 'mime/types'
-require 'bcp47'
-require 'bigdecimal'
-require 'logger'
-require 'tempfile'
+require "fhir_models/version"
 
-root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
-
-# Need to require Hashable first
-require File.join(root,'lib','bootstrap','hashable.rb')
-require File.join(root,'lib','bootstrap','json.rb')
-
-Dir.glob(File.join(root, 'lib','bootstrap','*.rb')).each do |file|
-  require file
-end
-Dir.glob(File.join(root, 'lib','bootstrap','**','*.rb')).each do |file|
-  require file
-end
-
-require File.join(root, 'lib','fhir.rb')
-
-# Require the generated code
-Dir.glob(File.join(root, 'lib','fhir','*.rb')).each do |file|
-  require file
-end
-Dir.glob(File.join(root, 'lib','fhir','**','*.rb')).each do |file|
-  require file
-end
-
-# Require the fluentpath code
-Dir.glob(File.join(root, 'lib','fluentpath','*.rb')).each do |file|
-  require file
-end
-
-# Require the fhir_ext code
-Dir.glob(File.join(root, 'lib','fhir_ext','*.rb')).each do |file|
-  require file
+module FhirModels
+  # Your code goes here...
 end
diff --git a/lib/bootstrap/definitions.rb b/lib/fhir_models/bootstrap/definitions.rb
similarity index 100%
rename from lib/bootstrap/definitions.rb
rename to lib/fhir_models/bootstrap/definitions.rb
diff --git a/lib/bootstrap/field.rb b/lib/fhir_models/bootstrap/field.rb
similarity index 100%
rename from lib/bootstrap/field.rb
rename to lib/fhir_models/bootstrap/field.rb
diff --git a/lib/bootstrap/generator.rb b/lib/fhir_models/bootstrap/generator.rb
similarity index 100%
rename from lib/bootstrap/generator.rb
rename to lib/fhir_models/bootstrap/generator.rb
diff --git a/lib/bootstrap/hashable.rb b/lib/fhir_models/bootstrap/hashable.rb
similarity index 100%
rename from lib/bootstrap/hashable.rb
rename to lib/fhir_models/bootstrap/hashable.rb
diff --git a/lib/bootstrap/json.rb b/lib/fhir_models/bootstrap/json.rb
similarity index 100%
rename from lib/bootstrap/json.rb
rename to lib/fhir_models/bootstrap/json.rb
diff --git a/lib/bootstrap/model.rb b/lib/fhir_models/bootstrap/model.rb
similarity index 100%
rename from lib/bootstrap/model.rb
rename to lib/fhir_models/bootstrap/model.rb
diff --git a/lib/bootstrap/preprocess.rb b/lib/fhir_models/bootstrap/preprocess.rb
similarity index 100%
rename from lib/bootstrap/preprocess.rb
rename to lib/fhir_models/bootstrap/preprocess.rb
diff --git a/lib/bootstrap/template.rb b/lib/fhir_models/bootstrap/template.rb
similarity index 100%
rename from lib/bootstrap/template.rb
rename to lib/fhir_models/bootstrap/template.rb
diff --git a/lib/bootstrap/xml.rb b/lib/fhir_models/bootstrap/xml.rb
similarity index 100%
rename from lib/bootstrap/xml.rb
rename to lib/fhir_models/bootstrap/xml.rb
diff --git a/lib/fhir/metadata.rb b/lib/fhir_models/fhir/metadata.rb
similarity index 100%
rename from lib/fhir/metadata.rb
rename to lib/fhir_models/fhir/metadata.rb
diff --git a/lib/fhir/resources/Account.rb b/lib/fhir_models/fhir/resources/Account.rb
similarity index 100%
rename from lib/fhir/resources/Account.rb
rename to lib/fhir_models/fhir/resources/Account.rb
diff --git a/lib/fhir/resources/ActivityDefinition.rb b/lib/fhir_models/fhir/resources/ActivityDefinition.rb
similarity index 100%
rename from lib/fhir/resources/ActivityDefinition.rb
rename to lib/fhir_models/fhir/resources/ActivityDefinition.rb
diff --git a/lib/fhir/resources/AllergyIntolerance.rb b/lib/fhir_models/fhir/resources/AllergyIntolerance.rb
similarity index 100%
rename from lib/fhir/resources/AllergyIntolerance.rb
rename to lib/fhir_models/fhir/resources/AllergyIntolerance.rb
diff --git a/lib/fhir/resources/Appointment.rb b/lib/fhir_models/fhir/resources/Appointment.rb
similarity index 100%
rename from lib/fhir/resources/Appointment.rb
rename to lib/fhir_models/fhir/resources/Appointment.rb
diff --git a/lib/fhir/resources/AppointmentResponse.rb b/lib/fhir_models/fhir/resources/AppointmentResponse.rb
similarity index 100%
rename from lib/fhir/resources/AppointmentResponse.rb
rename to lib/fhir_models/fhir/resources/AppointmentResponse.rb
diff --git a/lib/fhir/resources/AuditEvent.rb b/lib/fhir_models/fhir/resources/AuditEvent.rb
similarity index 100%
rename from lib/fhir/resources/AuditEvent.rb
rename to lib/fhir_models/fhir/resources/AuditEvent.rb
diff --git a/lib/fhir/resources/Basic.rb b/lib/fhir_models/fhir/resources/Basic.rb
similarity index 100%
rename from lib/fhir/resources/Basic.rb
rename to lib/fhir_models/fhir/resources/Basic.rb
diff --git a/lib/fhir/resources/Binary.rb b/lib/fhir_models/fhir/resources/Binary.rb
similarity index 100%
rename from lib/fhir/resources/Binary.rb
rename to lib/fhir_models/fhir/resources/Binary.rb
diff --git a/lib/fhir/resources/BodySite.rb b/lib/fhir_models/fhir/resources/BodySite.rb
similarity index 100%
rename from lib/fhir/resources/BodySite.rb
rename to lib/fhir_models/fhir/resources/BodySite.rb
diff --git a/lib/fhir/resources/Bundle.rb b/lib/fhir_models/fhir/resources/Bundle.rb
similarity index 100%
rename from lib/fhir/resources/Bundle.rb
rename to lib/fhir_models/fhir/resources/Bundle.rb
diff --git a/lib/fhir/resources/CarePlan.rb b/lib/fhir_models/fhir/resources/CarePlan.rb
similarity index 100%
rename from lib/fhir/resources/CarePlan.rb
rename to lib/fhir_models/fhir/resources/CarePlan.rb
diff --git a/lib/fhir/resources/CareTeam.rb b/lib/fhir_models/fhir/resources/CareTeam.rb
similarity index 100%
rename from lib/fhir/resources/CareTeam.rb
rename to lib/fhir_models/fhir/resources/CareTeam.rb
diff --git a/lib/fhir/resources/Claim.rb b/lib/fhir_models/fhir/resources/Claim.rb
similarity index 100%
rename from lib/fhir/resources/Claim.rb
rename to lib/fhir_models/fhir/resources/Claim.rb
diff --git a/lib/fhir/resources/ClaimResponse.rb b/lib/fhir_models/fhir/resources/ClaimResponse.rb
similarity index 100%
rename from lib/fhir/resources/ClaimResponse.rb
rename to lib/fhir_models/fhir/resources/ClaimResponse.rb
diff --git a/lib/fhir/resources/ClinicalImpression.rb b/lib/fhir_models/fhir/resources/ClinicalImpression.rb
similarity index 100%
rename from lib/fhir/resources/ClinicalImpression.rb
rename to lib/fhir_models/fhir/resources/ClinicalImpression.rb
diff --git a/lib/fhir/resources/CodeSystem.rb b/lib/fhir_models/fhir/resources/CodeSystem.rb
similarity index 100%
rename from lib/fhir/resources/CodeSystem.rb
rename to lib/fhir_models/fhir/resources/CodeSystem.rb
diff --git a/lib/fhir/resources/Communication.rb b/lib/fhir_models/fhir/resources/Communication.rb
similarity index 100%
rename from lib/fhir/resources/Communication.rb
rename to lib/fhir_models/fhir/resources/Communication.rb
diff --git a/lib/fhir/resources/CommunicationRequest.rb b/lib/fhir_models/fhir/resources/CommunicationRequest.rb
similarity index 100%
rename from lib/fhir/resources/CommunicationRequest.rb
rename to lib/fhir_models/fhir/resources/CommunicationRequest.rb
diff --git a/lib/fhir/resources/CompartmentDefinition.rb b/lib/fhir_models/fhir/resources/CompartmentDefinition.rb
similarity index 100%
rename from lib/fhir/resources/CompartmentDefinition.rb
rename to lib/fhir_models/fhir/resources/CompartmentDefinition.rb
diff --git a/lib/fhir/resources/Composition.rb b/lib/fhir_models/fhir/resources/Composition.rb
similarity index 100%
rename from lib/fhir/resources/Composition.rb
rename to lib/fhir_models/fhir/resources/Composition.rb
diff --git a/lib/fhir/resources/ConceptMap.rb b/lib/fhir_models/fhir/resources/ConceptMap.rb
similarity index 100%
rename from lib/fhir/resources/ConceptMap.rb
rename to lib/fhir_models/fhir/resources/ConceptMap.rb
diff --git a/lib/fhir/resources/Condition.rb b/lib/fhir_models/fhir/resources/Condition.rb
similarity index 100%
rename from lib/fhir/resources/Condition.rb
rename to lib/fhir_models/fhir/resources/Condition.rb
diff --git a/lib/fhir/resources/Conformance.rb b/lib/fhir_models/fhir/resources/Conformance.rb
similarity index 100%
rename from lib/fhir/resources/Conformance.rb
rename to lib/fhir_models/fhir/resources/Conformance.rb
diff --git a/lib/fhir/resources/Consent.rb b/lib/fhir_models/fhir/resources/Consent.rb
similarity index 100%
rename from lib/fhir/resources/Consent.rb
rename to lib/fhir_models/fhir/resources/Consent.rb
diff --git a/lib/fhir/resources/Contract.rb b/lib/fhir_models/fhir/resources/Contract.rb
similarity index 100%
rename from lib/fhir/resources/Contract.rb
rename to lib/fhir_models/fhir/resources/Contract.rb
diff --git a/lib/fhir/resources/Coverage.rb b/lib/fhir_models/fhir/resources/Coverage.rb
similarity index 100%
rename from lib/fhir/resources/Coverage.rb
rename to lib/fhir_models/fhir/resources/Coverage.rb
diff --git a/lib/fhir/resources/DataElement.rb b/lib/fhir_models/fhir/resources/DataElement.rb
similarity index 100%
rename from lib/fhir/resources/DataElement.rb
rename to lib/fhir_models/fhir/resources/DataElement.rb
diff --git a/lib/fhir/resources/DecisionSupportServiceModule.rb b/lib/fhir_models/fhir/resources/DecisionSupportServiceModule.rb
similarity index 100%
rename from lib/fhir/resources/DecisionSupportServiceModule.rb
rename to lib/fhir_models/fhir/resources/DecisionSupportServiceModule.rb
diff --git a/lib/fhir/resources/DetectedIssue.rb b/lib/fhir_models/fhir/resources/DetectedIssue.rb
similarity index 100%
rename from lib/fhir/resources/DetectedIssue.rb
rename to lib/fhir_models/fhir/resources/DetectedIssue.rb
diff --git a/lib/fhir/resources/Device.rb b/lib/fhir_models/fhir/resources/Device.rb
similarity index 100%
rename from lib/fhir/resources/Device.rb
rename to lib/fhir_models/fhir/resources/Device.rb
diff --git a/lib/fhir/resources/DeviceComponent.rb b/lib/fhir_models/fhir/resources/DeviceComponent.rb
similarity index 100%
rename from lib/fhir/resources/DeviceComponent.rb
rename to lib/fhir_models/fhir/resources/DeviceComponent.rb
diff --git a/lib/fhir/resources/DeviceMetric.rb b/lib/fhir_models/fhir/resources/DeviceMetric.rb
similarity index 100%
rename from lib/fhir/resources/DeviceMetric.rb
rename to lib/fhir_models/fhir/resources/DeviceMetric.rb
diff --git a/lib/fhir/resources/DeviceUseRequest.rb b/lib/fhir_models/fhir/resources/DeviceUseRequest.rb
similarity index 100%
rename from lib/fhir/resources/DeviceUseRequest.rb
rename to lib/fhir_models/fhir/resources/DeviceUseRequest.rb
diff --git a/lib/fhir/resources/DeviceUseStatement.rb b/lib/fhir_models/fhir/resources/DeviceUseStatement.rb
similarity index 100%
rename from lib/fhir/resources/DeviceUseStatement.rb
rename to lib/fhir_models/fhir/resources/DeviceUseStatement.rb
diff --git a/lib/fhir/resources/DiagnosticReport.rb b/lib/fhir_models/fhir/resources/DiagnosticReport.rb
similarity index 100%
rename from lib/fhir/resources/DiagnosticReport.rb
rename to lib/fhir_models/fhir/resources/DiagnosticReport.rb
diff --git a/lib/fhir/resources/DiagnosticRequest.rb b/lib/fhir_models/fhir/resources/DiagnosticRequest.rb
similarity index 100%
rename from lib/fhir/resources/DiagnosticRequest.rb
rename to lib/fhir_models/fhir/resources/DiagnosticRequest.rb
diff --git a/lib/fhir/resources/DocumentManifest.rb b/lib/fhir_models/fhir/resources/DocumentManifest.rb
similarity index 100%
rename from lib/fhir/resources/DocumentManifest.rb
rename to lib/fhir_models/fhir/resources/DocumentManifest.rb
diff --git a/lib/fhir/resources/DocumentReference.rb b/lib/fhir_models/fhir/resources/DocumentReference.rb
similarity index 100%
rename from lib/fhir/resources/DocumentReference.rb
rename to lib/fhir_models/fhir/resources/DocumentReference.rb
diff --git a/lib/fhir/resources/DomainResource.rb b/lib/fhir_models/fhir/resources/DomainResource.rb
similarity index 100%
rename from lib/fhir/resources/DomainResource.rb
rename to lib/fhir_models/fhir/resources/DomainResource.rb
diff --git a/lib/fhir/resources/EligibilityRequest.rb b/lib/fhir_models/fhir/resources/EligibilityRequest.rb
similarity index 100%
rename from lib/fhir/resources/EligibilityRequest.rb
rename to lib/fhir_models/fhir/resources/EligibilityRequest.rb
diff --git a/lib/fhir/resources/EligibilityResponse.rb b/lib/fhir_models/fhir/resources/EligibilityResponse.rb
similarity index 100%
rename from lib/fhir/resources/EligibilityResponse.rb
rename to lib/fhir_models/fhir/resources/EligibilityResponse.rb
diff --git a/lib/fhir/resources/Encounter.rb b/lib/fhir_models/fhir/resources/Encounter.rb
similarity index 100%
rename from lib/fhir/resources/Encounter.rb
rename to lib/fhir_models/fhir/resources/Encounter.rb
diff --git a/lib/fhir/resources/Endpoint.rb b/lib/fhir_models/fhir/resources/Endpoint.rb
similarity index 100%
rename from lib/fhir/resources/Endpoint.rb
rename to lib/fhir_models/fhir/resources/Endpoint.rb
diff --git a/lib/fhir/resources/EnrollmentRequest.rb b/lib/fhir_models/fhir/resources/EnrollmentRequest.rb
similarity index 100%
rename from lib/fhir/resources/EnrollmentRequest.rb
rename to lib/fhir_models/fhir/resources/EnrollmentRequest.rb
diff --git a/lib/fhir/resources/EnrollmentResponse.rb b/lib/fhir_models/fhir/resources/EnrollmentResponse.rb
similarity index 100%
rename from lib/fhir/resources/EnrollmentResponse.rb
rename to lib/fhir_models/fhir/resources/EnrollmentResponse.rb
diff --git a/lib/fhir/resources/EpisodeOfCare.rb b/lib/fhir_models/fhir/resources/EpisodeOfCare.rb
similarity index 100%
rename from lib/fhir/resources/EpisodeOfCare.rb
rename to lib/fhir_models/fhir/resources/EpisodeOfCare.rb
diff --git a/lib/fhir/resources/ExpansionProfile.rb b/lib/fhir_models/fhir/resources/ExpansionProfile.rb
similarity index 100%
rename from lib/fhir/resources/ExpansionProfile.rb
rename to lib/fhir_models/fhir/resources/ExpansionProfile.rb
diff --git a/lib/fhir/resources/ExplanationOfBenefit.rb b/lib/fhir_models/fhir/resources/ExplanationOfBenefit.rb
similarity index 100%
rename from lib/fhir/resources/ExplanationOfBenefit.rb
rename to lib/fhir_models/fhir/resources/ExplanationOfBenefit.rb
diff --git a/lib/fhir/resources/FamilyMemberHistory.rb b/lib/fhir_models/fhir/resources/FamilyMemberHistory.rb
similarity index 100%
rename from lib/fhir/resources/FamilyMemberHistory.rb
rename to lib/fhir_models/fhir/resources/FamilyMemberHistory.rb
diff --git a/lib/fhir/resources/Flag.rb b/lib/fhir_models/fhir/resources/Flag.rb
similarity index 100%
rename from lib/fhir/resources/Flag.rb
rename to lib/fhir_models/fhir/resources/Flag.rb
diff --git a/lib/fhir/resources/Goal.rb b/lib/fhir_models/fhir/resources/Goal.rb
similarity index 100%
rename from lib/fhir/resources/Goal.rb
rename to lib/fhir_models/fhir/resources/Goal.rb
diff --git a/lib/fhir/resources/Group.rb b/lib/fhir_models/fhir/resources/Group.rb
similarity index 100%
rename from lib/fhir/resources/Group.rb
rename to lib/fhir_models/fhir/resources/Group.rb
diff --git a/lib/fhir/resources/GuidanceResponse.rb b/lib/fhir_models/fhir/resources/GuidanceResponse.rb
similarity index 100%
rename from lib/fhir/resources/GuidanceResponse.rb
rename to lib/fhir_models/fhir/resources/GuidanceResponse.rb
diff --git a/lib/fhir/resources/HealthcareService.rb b/lib/fhir_models/fhir/resources/HealthcareService.rb
similarity index 100%
rename from lib/fhir/resources/HealthcareService.rb
rename to lib/fhir_models/fhir/resources/HealthcareService.rb
diff --git a/lib/fhir/resources/ImagingManifest.rb b/lib/fhir_models/fhir/resources/ImagingManifest.rb
similarity index 100%
rename from lib/fhir/resources/ImagingManifest.rb
rename to lib/fhir_models/fhir/resources/ImagingManifest.rb
diff --git a/lib/fhir/resources/ImagingStudy.rb b/lib/fhir_models/fhir/resources/ImagingStudy.rb
similarity index 100%
rename from lib/fhir/resources/ImagingStudy.rb
rename to lib/fhir_models/fhir/resources/ImagingStudy.rb
diff --git a/lib/fhir/resources/Immunization.rb b/lib/fhir_models/fhir/resources/Immunization.rb
similarity index 100%
rename from lib/fhir/resources/Immunization.rb
rename to lib/fhir_models/fhir/resources/Immunization.rb
diff --git a/lib/fhir/resources/ImmunizationRecommendation.rb b/lib/fhir_models/fhir/resources/ImmunizationRecommendation.rb
similarity index 100%
rename from lib/fhir/resources/ImmunizationRecommendation.rb
rename to lib/fhir_models/fhir/resources/ImmunizationRecommendation.rb
diff --git a/lib/fhir/resources/ImplementationGuide.rb b/lib/fhir_models/fhir/resources/ImplementationGuide.rb
similarity index 100%
rename from lib/fhir/resources/ImplementationGuide.rb
rename to lib/fhir_models/fhir/resources/ImplementationGuide.rb
diff --git a/lib/fhir/resources/Library.rb b/lib/fhir_models/fhir/resources/Library.rb
similarity index 100%
rename from lib/fhir/resources/Library.rb
rename to lib/fhir_models/fhir/resources/Library.rb
diff --git a/lib/fhir/resources/Linkage.rb b/lib/fhir_models/fhir/resources/Linkage.rb
similarity index 100%
rename from lib/fhir/resources/Linkage.rb
rename to lib/fhir_models/fhir/resources/Linkage.rb
diff --git a/lib/fhir/resources/List.rb b/lib/fhir_models/fhir/resources/List.rb
similarity index 100%
rename from lib/fhir/resources/List.rb
rename to lib/fhir_models/fhir/resources/List.rb
diff --git a/lib/fhir/resources/Location.rb b/lib/fhir_models/fhir/resources/Location.rb
similarity index 100%
rename from lib/fhir/resources/Location.rb
rename to lib/fhir_models/fhir/resources/Location.rb
diff --git a/lib/fhir/resources/Measure.rb b/lib/fhir_models/fhir/resources/Measure.rb
similarity index 100%
rename from lib/fhir/resources/Measure.rb
rename to lib/fhir_models/fhir/resources/Measure.rb
diff --git a/lib/fhir/resources/MeasureReport.rb b/lib/fhir_models/fhir/resources/MeasureReport.rb
similarity index 100%
rename from lib/fhir/resources/MeasureReport.rb
rename to lib/fhir_models/fhir/resources/MeasureReport.rb
diff --git a/lib/fhir/resources/Media.rb b/lib/fhir_models/fhir/resources/Media.rb
similarity index 100%
rename from lib/fhir/resources/Media.rb
rename to lib/fhir_models/fhir/resources/Media.rb
diff --git a/lib/fhir/resources/Medication.rb b/lib/fhir_models/fhir/resources/Medication.rb
similarity index 100%
rename from lib/fhir/resources/Medication.rb
rename to lib/fhir_models/fhir/resources/Medication.rb
diff --git a/lib/fhir/resources/MedicationAdministration.rb b/lib/fhir_models/fhir/resources/MedicationAdministration.rb
similarity index 100%
rename from lib/fhir/resources/MedicationAdministration.rb
rename to lib/fhir_models/fhir/resources/MedicationAdministration.rb
diff --git a/lib/fhir/resources/MedicationDispense.rb b/lib/fhir_models/fhir/resources/MedicationDispense.rb
similarity index 100%
rename from lib/fhir/resources/MedicationDispense.rb
rename to lib/fhir_models/fhir/resources/MedicationDispense.rb
diff --git a/lib/fhir/resources/MedicationOrder.rb b/lib/fhir_models/fhir/resources/MedicationOrder.rb
similarity index 100%
rename from lib/fhir/resources/MedicationOrder.rb
rename to lib/fhir_models/fhir/resources/MedicationOrder.rb
diff --git a/lib/fhir/resources/MedicationStatement.rb b/lib/fhir_models/fhir/resources/MedicationStatement.rb
similarity index 100%
rename from lib/fhir/resources/MedicationStatement.rb
rename to lib/fhir_models/fhir/resources/MedicationStatement.rb
diff --git a/lib/fhir/resources/MessageHeader.rb b/lib/fhir_models/fhir/resources/MessageHeader.rb
similarity index 100%
rename from lib/fhir/resources/MessageHeader.rb
rename to lib/fhir_models/fhir/resources/MessageHeader.rb
diff --git a/lib/fhir/resources/NamingSystem.rb b/lib/fhir_models/fhir/resources/NamingSystem.rb
similarity index 100%
rename from lib/fhir/resources/NamingSystem.rb
rename to lib/fhir_models/fhir/resources/NamingSystem.rb
diff --git a/lib/fhir/resources/NutritionRequest.rb b/lib/fhir_models/fhir/resources/NutritionRequest.rb
similarity index 100%
rename from lib/fhir/resources/NutritionRequest.rb
rename to lib/fhir_models/fhir/resources/NutritionRequest.rb
diff --git a/lib/fhir/resources/Observation.rb b/lib/fhir_models/fhir/resources/Observation.rb
similarity index 100%
rename from lib/fhir/resources/Observation.rb
rename to lib/fhir_models/fhir/resources/Observation.rb
diff --git a/lib/fhir/resources/OperationDefinition.rb b/lib/fhir_models/fhir/resources/OperationDefinition.rb
similarity index 100%
rename from lib/fhir/resources/OperationDefinition.rb
rename to lib/fhir_models/fhir/resources/OperationDefinition.rb
diff --git a/lib/fhir/resources/OperationOutcome.rb b/lib/fhir_models/fhir/resources/OperationOutcome.rb
similarity index 100%
rename from lib/fhir/resources/OperationOutcome.rb
rename to lib/fhir_models/fhir/resources/OperationOutcome.rb
diff --git a/lib/fhir/resources/Organization.rb b/lib/fhir_models/fhir/resources/Organization.rb
similarity index 100%
rename from lib/fhir/resources/Organization.rb
rename to lib/fhir_models/fhir/resources/Organization.rb
diff --git a/lib/fhir/resources/Parameters.rb b/lib/fhir_models/fhir/resources/Parameters.rb
similarity index 100%
rename from lib/fhir/resources/Parameters.rb
rename to lib/fhir_models/fhir/resources/Parameters.rb
diff --git a/lib/fhir/resources/Patient.rb b/lib/fhir_models/fhir/resources/Patient.rb
similarity index 100%
rename from lib/fhir/resources/Patient.rb
rename to lib/fhir_models/fhir/resources/Patient.rb
diff --git a/lib/fhir/resources/PaymentNotice.rb b/lib/fhir_models/fhir/resources/PaymentNotice.rb
similarity index 100%
rename from lib/fhir/resources/PaymentNotice.rb
rename to lib/fhir_models/fhir/resources/PaymentNotice.rb
diff --git a/lib/fhir/resources/PaymentReconciliation.rb b/lib/fhir_models/fhir/resources/PaymentReconciliation.rb
similarity index 100%
rename from lib/fhir/resources/PaymentReconciliation.rb
rename to lib/fhir_models/fhir/resources/PaymentReconciliation.rb
diff --git a/lib/fhir/resources/Person.rb b/lib/fhir_models/fhir/resources/Person.rb
similarity index 100%
rename from lib/fhir/resources/Person.rb
rename to lib/fhir_models/fhir/resources/Person.rb
diff --git a/lib/fhir/resources/PlanDefinition.rb b/lib/fhir_models/fhir/resources/PlanDefinition.rb
similarity index 100%
rename from lib/fhir/resources/PlanDefinition.rb
rename to lib/fhir_models/fhir/resources/PlanDefinition.rb
diff --git a/lib/fhir/resources/Practitioner.rb b/lib/fhir_models/fhir/resources/Practitioner.rb
similarity index 100%
rename from lib/fhir/resources/Practitioner.rb
rename to lib/fhir_models/fhir/resources/Practitioner.rb
diff --git a/lib/fhir/resources/PractitionerRole.rb b/lib/fhir_models/fhir/resources/PractitionerRole.rb
similarity index 100%
rename from lib/fhir/resources/PractitionerRole.rb
rename to lib/fhir_models/fhir/resources/PractitionerRole.rb
diff --git a/lib/fhir/resources/Procedure.rb b/lib/fhir_models/fhir/resources/Procedure.rb
similarity index 100%
rename from lib/fhir/resources/Procedure.rb
rename to lib/fhir_models/fhir/resources/Procedure.rb
diff --git a/lib/fhir/resources/ProcedureRequest.rb b/lib/fhir_models/fhir/resources/ProcedureRequest.rb
similarity index 100%
rename from lib/fhir/resources/ProcedureRequest.rb
rename to lib/fhir_models/fhir/resources/ProcedureRequest.rb
diff --git a/lib/fhir/resources/ProcessRequest.rb b/lib/fhir_models/fhir/resources/ProcessRequest.rb
similarity index 100%
rename from lib/fhir/resources/ProcessRequest.rb
rename to lib/fhir_models/fhir/resources/ProcessRequest.rb
diff --git a/lib/fhir/resources/ProcessResponse.rb b/lib/fhir_models/fhir/resources/ProcessResponse.rb
similarity index 100%
rename from lib/fhir/resources/ProcessResponse.rb
rename to lib/fhir_models/fhir/resources/ProcessResponse.rb
diff --git a/lib/fhir/resources/Provenance.rb b/lib/fhir_models/fhir/resources/Provenance.rb
similarity index 100%
rename from lib/fhir/resources/Provenance.rb
rename to lib/fhir_models/fhir/resources/Provenance.rb
diff --git a/lib/fhir/resources/Questionnaire.rb b/lib/fhir_models/fhir/resources/Questionnaire.rb
similarity index 100%
rename from lib/fhir/resources/Questionnaire.rb
rename to lib/fhir_models/fhir/resources/Questionnaire.rb
diff --git a/lib/fhir/resources/QuestionnaireResponse.rb b/lib/fhir_models/fhir/resources/QuestionnaireResponse.rb
similarity index 100%
rename from lib/fhir/resources/QuestionnaireResponse.rb
rename to lib/fhir_models/fhir/resources/QuestionnaireResponse.rb
diff --git a/lib/fhir/resources/ReferralRequest.rb b/lib/fhir_models/fhir/resources/ReferralRequest.rb
similarity index 100%
rename from lib/fhir/resources/ReferralRequest.rb
rename to lib/fhir_models/fhir/resources/ReferralRequest.rb
diff --git a/lib/fhir/resources/RelatedPerson.rb b/lib/fhir_models/fhir/resources/RelatedPerson.rb
similarity index 100%
rename from lib/fhir/resources/RelatedPerson.rb
rename to lib/fhir_models/fhir/resources/RelatedPerson.rb
diff --git a/lib/fhir/resources/Resource.rb b/lib/fhir_models/fhir/resources/Resource.rb
similarity index 100%
rename from lib/fhir/resources/Resource.rb
rename to lib/fhir_models/fhir/resources/Resource.rb
diff --git a/lib/fhir/resources/RiskAssessment.rb b/lib/fhir_models/fhir/resources/RiskAssessment.rb
similarity index 100%
rename from lib/fhir/resources/RiskAssessment.rb
rename to lib/fhir_models/fhir/resources/RiskAssessment.rb
diff --git a/lib/fhir/resources/Schedule.rb b/lib/fhir_models/fhir/resources/Schedule.rb
similarity index 100%
rename from lib/fhir/resources/Schedule.rb
rename to lib/fhir_models/fhir/resources/Schedule.rb
diff --git a/lib/fhir/resources/SearchParameter.rb b/lib/fhir_models/fhir/resources/SearchParameter.rb
similarity index 100%
rename from lib/fhir/resources/SearchParameter.rb
rename to lib/fhir_models/fhir/resources/SearchParameter.rb
diff --git a/lib/fhir/resources/Sequence.rb b/lib/fhir_models/fhir/resources/Sequence.rb
similarity index 100%
rename from lib/fhir/resources/Sequence.rb
rename to lib/fhir_models/fhir/resources/Sequence.rb
diff --git a/lib/fhir/resources/Slot.rb b/lib/fhir_models/fhir/resources/Slot.rb
similarity index 100%
rename from lib/fhir/resources/Slot.rb
rename to lib/fhir_models/fhir/resources/Slot.rb
diff --git a/lib/fhir/resources/Specimen.rb b/lib/fhir_models/fhir/resources/Specimen.rb
similarity index 100%
rename from lib/fhir/resources/Specimen.rb
rename to lib/fhir_models/fhir/resources/Specimen.rb
diff --git a/lib/fhir/resources/StructureDefinition.rb b/lib/fhir_models/fhir/resources/StructureDefinition.rb
similarity index 100%
rename from lib/fhir/resources/StructureDefinition.rb
rename to lib/fhir_models/fhir/resources/StructureDefinition.rb
diff --git a/lib/fhir/resources/StructureMap.rb b/lib/fhir_models/fhir/resources/StructureMap.rb
similarity index 100%
rename from lib/fhir/resources/StructureMap.rb
rename to lib/fhir_models/fhir/resources/StructureMap.rb
diff --git a/lib/fhir/resources/Subscription.rb b/lib/fhir_models/fhir/resources/Subscription.rb
similarity index 100%
rename from lib/fhir/resources/Subscription.rb
rename to lib/fhir_models/fhir/resources/Subscription.rb
diff --git a/lib/fhir/resources/Substance.rb b/lib/fhir_models/fhir/resources/Substance.rb
similarity index 100%
rename from lib/fhir/resources/Substance.rb
rename to lib/fhir_models/fhir/resources/Substance.rb
diff --git a/lib/fhir/resources/SupplyDelivery.rb b/lib/fhir_models/fhir/resources/SupplyDelivery.rb
similarity index 100%
rename from lib/fhir/resources/SupplyDelivery.rb
rename to lib/fhir_models/fhir/resources/SupplyDelivery.rb
diff --git a/lib/fhir/resources/SupplyRequest.rb b/lib/fhir_models/fhir/resources/SupplyRequest.rb
similarity index 100%
rename from lib/fhir/resources/SupplyRequest.rb
rename to lib/fhir_models/fhir/resources/SupplyRequest.rb
diff --git a/lib/fhir/resources/Task.rb b/lib/fhir_models/fhir/resources/Task.rb
similarity index 100%
rename from lib/fhir/resources/Task.rb
rename to lib/fhir_models/fhir/resources/Task.rb
diff --git a/lib/fhir/resources/TestScript.rb b/lib/fhir_models/fhir/resources/TestScript.rb
similarity index 100%
rename from lib/fhir/resources/TestScript.rb
rename to lib/fhir_models/fhir/resources/TestScript.rb
diff --git a/lib/fhir/resources/ValueSet.rb b/lib/fhir_models/fhir/resources/ValueSet.rb
similarity index 100%
rename from lib/fhir/resources/ValueSet.rb
rename to lib/fhir_models/fhir/resources/ValueSet.rb
diff --git a/lib/fhir/resources/VisionPrescription.rb b/lib/fhir_models/fhir/resources/VisionPrescription.rb
similarity index 100%
rename from lib/fhir/resources/VisionPrescription.rb
rename to lib/fhir_models/fhir/resources/VisionPrescription.rb
diff --git a/lib/fhir/types/Address.rb b/lib/fhir_models/fhir/types/Address.rb
similarity index 100%
rename from lib/fhir/types/Address.rb
rename to lib/fhir_models/fhir/types/Address.rb
diff --git a/lib/fhir/types/Age.rb b/lib/fhir_models/fhir/types/Age.rb
similarity index 100%
rename from lib/fhir/types/Age.rb
rename to lib/fhir_models/fhir/types/Age.rb
diff --git a/lib/fhir/types/Annotation.rb b/lib/fhir_models/fhir/types/Annotation.rb
similarity index 100%
rename from lib/fhir/types/Annotation.rb
rename to lib/fhir_models/fhir/types/Annotation.rb
diff --git a/lib/fhir/types/Attachment.rb b/lib/fhir_models/fhir/types/Attachment.rb
similarity index 100%
rename from lib/fhir/types/Attachment.rb
rename to lib/fhir_models/fhir/types/Attachment.rb
diff --git a/lib/fhir/types/BackboneElement.rb b/lib/fhir_models/fhir/types/BackboneElement.rb
similarity index 100%
rename from lib/fhir/types/BackboneElement.rb
rename to lib/fhir_models/fhir/types/BackboneElement.rb
diff --git a/lib/fhir/types/CodeableConcept.rb b/lib/fhir_models/fhir/types/CodeableConcept.rb
similarity index 100%
rename from lib/fhir/types/CodeableConcept.rb
rename to lib/fhir_models/fhir/types/CodeableConcept.rb
diff --git a/lib/fhir/types/Coding.rb b/lib/fhir_models/fhir/types/Coding.rb
similarity index 100%
rename from lib/fhir/types/Coding.rb
rename to lib/fhir_models/fhir/types/Coding.rb
diff --git a/lib/fhir/types/ContactDetail.rb b/lib/fhir_models/fhir/types/ContactDetail.rb
similarity index 100%
rename from lib/fhir/types/ContactDetail.rb
rename to lib/fhir_models/fhir/types/ContactDetail.rb
diff --git a/lib/fhir/types/ContactPoint.rb b/lib/fhir_models/fhir/types/ContactPoint.rb
similarity index 100%
rename from lib/fhir/types/ContactPoint.rb
rename to lib/fhir_models/fhir/types/ContactPoint.rb
diff --git a/lib/fhir/types/Contributor.rb b/lib/fhir_models/fhir/types/Contributor.rb
similarity index 100%
rename from lib/fhir/types/Contributor.rb
rename to lib/fhir_models/fhir/types/Contributor.rb
diff --git a/lib/fhir/types/Count.rb b/lib/fhir_models/fhir/types/Count.rb
similarity index 100%
rename from lib/fhir/types/Count.rb
rename to lib/fhir_models/fhir/types/Count.rb
diff --git a/lib/fhir/types/DataRequirement.rb b/lib/fhir_models/fhir/types/DataRequirement.rb
similarity index 100%
rename from lib/fhir/types/DataRequirement.rb
rename to lib/fhir_models/fhir/types/DataRequirement.rb
diff --git a/lib/fhir/types/Distance.rb b/lib/fhir_models/fhir/types/Distance.rb
similarity index 100%
rename from lib/fhir/types/Distance.rb
rename to lib/fhir_models/fhir/types/Distance.rb
diff --git a/lib/fhir/types/Duration.rb b/lib/fhir_models/fhir/types/Duration.rb
similarity index 100%
rename from lib/fhir/types/Duration.rb
rename to lib/fhir_models/fhir/types/Duration.rb
diff --git a/lib/fhir/types/Element.rb b/lib/fhir_models/fhir/types/Element.rb
similarity index 100%
rename from lib/fhir/types/Element.rb
rename to lib/fhir_models/fhir/types/Element.rb
diff --git a/lib/fhir/types/ElementDefinition.rb b/lib/fhir_models/fhir/types/ElementDefinition.rb
similarity index 100%
rename from lib/fhir/types/ElementDefinition.rb
rename to lib/fhir_models/fhir/types/ElementDefinition.rb
diff --git a/lib/fhir/types/Extension.rb b/lib/fhir_models/fhir/types/Extension.rb
similarity index 100%
rename from lib/fhir/types/Extension.rb
rename to lib/fhir_models/fhir/types/Extension.rb
diff --git a/lib/fhir/types/HumanName.rb b/lib/fhir_models/fhir/types/HumanName.rb
similarity index 100%
rename from lib/fhir/types/HumanName.rb
rename to lib/fhir_models/fhir/types/HumanName.rb
diff --git a/lib/fhir/types/Identifier.rb b/lib/fhir_models/fhir/types/Identifier.rb
similarity index 100%
rename from lib/fhir/types/Identifier.rb
rename to lib/fhir_models/fhir/types/Identifier.rb
diff --git a/lib/fhir/types/Meta.rb b/lib/fhir_models/fhir/types/Meta.rb
similarity index 100%
rename from lib/fhir/types/Meta.rb
rename to lib/fhir_models/fhir/types/Meta.rb
diff --git a/lib/fhir/types/Money.rb b/lib/fhir_models/fhir/types/Money.rb
similarity index 100%
rename from lib/fhir/types/Money.rb
rename to lib/fhir_models/fhir/types/Money.rb
diff --git a/lib/fhir/types/Narrative.rb b/lib/fhir_models/fhir/types/Narrative.rb
similarity index 100%
rename from lib/fhir/types/Narrative.rb
rename to lib/fhir_models/fhir/types/Narrative.rb
diff --git a/lib/fhir/types/ParameterDefinition.rb b/lib/fhir_models/fhir/types/ParameterDefinition.rb
similarity index 100%
rename from lib/fhir/types/ParameterDefinition.rb
rename to lib/fhir_models/fhir/types/ParameterDefinition.rb
diff --git a/lib/fhir/types/Period.rb b/lib/fhir_models/fhir/types/Period.rb
similarity index 100%
rename from lib/fhir/types/Period.rb
rename to lib/fhir_models/fhir/types/Period.rb
diff --git a/lib/fhir/types/Quantity.rb b/lib/fhir_models/fhir/types/Quantity.rb
similarity index 100%
rename from lib/fhir/types/Quantity.rb
rename to lib/fhir_models/fhir/types/Quantity.rb
diff --git a/lib/fhir/types/Range.rb b/lib/fhir_models/fhir/types/Range.rb
similarity index 100%
rename from lib/fhir/types/Range.rb
rename to lib/fhir_models/fhir/types/Range.rb
diff --git a/lib/fhir/types/Ratio.rb b/lib/fhir_models/fhir/types/Ratio.rb
similarity index 100%
rename from lib/fhir/types/Ratio.rb
rename to lib/fhir_models/fhir/types/Ratio.rb
diff --git a/lib/fhir/types/Reference.rb b/lib/fhir_models/fhir/types/Reference.rb
similarity index 100%
rename from lib/fhir/types/Reference.rb
rename to lib/fhir_models/fhir/types/Reference.rb
diff --git a/lib/fhir/types/RelatedResource.rb b/lib/fhir_models/fhir/types/RelatedResource.rb
similarity index 100%
rename from lib/fhir/types/RelatedResource.rb
rename to lib/fhir_models/fhir/types/RelatedResource.rb
diff --git a/lib/fhir/types/SampledData.rb b/lib/fhir_models/fhir/types/SampledData.rb
similarity index 100%
rename from lib/fhir/types/SampledData.rb
rename to lib/fhir_models/fhir/types/SampledData.rb
diff --git a/lib/fhir/types/Signature.rb b/lib/fhir_models/fhir/types/Signature.rb
similarity index 100%
rename from lib/fhir/types/Signature.rb
rename to lib/fhir_models/fhir/types/Signature.rb
diff --git a/lib/fhir/types/Timing.rb b/lib/fhir_models/fhir/types/Timing.rb
similarity index 100%
rename from lib/fhir/types/Timing.rb
rename to lib/fhir_models/fhir/types/Timing.rb
diff --git a/lib/fhir/types/TriggerDefinition.rb b/lib/fhir_models/fhir/types/TriggerDefinition.rb
similarity index 100%
rename from lib/fhir/types/TriggerDefinition.rb
rename to lib/fhir_models/fhir/types/TriggerDefinition.rb
diff --git a/lib/fhir/types/UsageContext.rb b/lib/fhir_models/fhir/types/UsageContext.rb
similarity index 100%
rename from lib/fhir/types/UsageContext.rb
rename to lib/fhir_models/fhir/types/UsageContext.rb
diff --git a/lib/fhir_ext/StructureDefinition.rb b/lib/fhir_models/fhir_ext/StructureDefinition.rb
similarity index 100%
rename from lib/fhir_ext/StructureDefinition.rb
rename to lib/fhir_models/fhir_ext/StructureDefinition.rb
diff --git a/lib/fhir_ext/StructureDefinitionFinding.rb b/lib/fhir_models/fhir_ext/StructureDefinitionFinding.rb
similarity index 100%
rename from lib/fhir_ext/StructureDefinitionFinding.rb
rename to lib/fhir_models/fhir_ext/StructureDefinitionFinding.rb
diff --git a/lib/fluentpath/evaluate.rb b/lib/fhir_models/fluentpath/evaluate.rb
similarity index 100%
rename from lib/fluentpath/evaluate.rb
rename to lib/fhir_models/fluentpath/evaluate.rb
diff --git a/lib/fluentpath/expression.rb b/lib/fhir_models/fluentpath/expression.rb
similarity index 100%
rename from lib/fluentpath/expression.rb
rename to lib/fhir_models/fluentpath/expression.rb
diff --git a/lib/fluentpath/parse.rb b/lib/fhir_models/fluentpath/parse.rb
similarity index 100%
rename from lib/fluentpath/parse.rb
rename to lib/fhir_models/fluentpath/parse.rb
diff --git a/lib/tasks/tasks.rake b/lib/fhir_models/tasks/tasks.rake
similarity index 100%
rename from lib/tasks/tasks.rake
rename to lib/fhir_models/tasks/tasks.rake
diff --git a/lib/fhir_models/version.rb b/lib/fhir_models/version.rb
new file mode 100644
index 000000000..578509745
--- /dev/null
+++ b/lib/fhir_models/version.rb
@@ -0,0 +1,5 @@
+module FHIR
+  module Models
+    VERSION = "1.6.3"
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.old.rb
similarity index 100%
rename from test/test_helper.rb
rename to test/test_helper.old.rb