Merge pull request #1025 from jmarin/api-model

Refactor apiModel to api.model
cfpb · Jun 30, 2017 · f6e3152 · f6e3152
2 parents 572897a + 47c196c
commit f6e3152
Show file tree

Hide file tree

Showing 77 changed files with 127 additions and 127 deletions.
diff --git a/...ala/hmda.apiModel/model/EditResults.scala → ...in/scala/hmda/api/model/EditResults.scala b/...ala/hmda.apiModel/model/EditResults.scala → ...in/scala/hmda/api/model/EditResults.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.SubmissionStatus
 import spray.json.JsObject

diff --git a/...a/hmda.apiModel/model/ErrorResponse.scala → .../scala/hmda/api/model/ErrorResponse.scala b/...a/hmda.apiModel/model/ErrorResponse.scala → .../scala/hmda/api/model/ErrorResponse.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import akka.http.scaladsl.model.Uri.Path
 

diff --git a/...la/hmda.apiModel/model/FilingDetail.scala → ...n/scala/hmda/api/model/FilingDetail.scala b/...la/hmda.apiModel/model/FilingDetail.scala → ...n/scala/hmda/api/model/FilingDetail.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.{ Filing, Submission }
 

diff --git a/...n/scala/hmda.apiModel/model/Filings.scala → ...c/main/scala/hmda/api/model/Filings.scala b/...n/scala/hmda.apiModel/model/Filings.scala → ...c/main/scala/hmda/api/model/Filings.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.Filing
 

diff --git a/...da.apiModel/model/InstitutionDetail.scala → ...la/hmda/api/model/InstitutionDetail.scala b/...da.apiModel/model/InstitutionDetail.scala → ...la/hmda/api/model/InstitutionDetail.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.Filing
 

diff --git a/...a.apiModel/model/InstitutionWrapper.scala → ...a/hmda/api/model/InstitutionWrapper.scala b/...a.apiModel/model/InstitutionWrapper.scala → ...a/hmda/api/model/InstitutionWrapper.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 case class InstitutionWrapper(
   id: String,

diff --git a/...la/hmda.apiModel/model/Institutions.scala → ...n/scala/hmda/api/model/Institutions.scala b/...la/hmda.apiModel/model/Institutions.scala → ...n/scala/hmda/api/model/Institutions.scala
@@ -1,3 +1,3 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 case class Institutions(institutions: Set[InstitutionWrapper])
diff --git a/...ala/hmda.apiModel/model/IrsResponse.scala → ...in/scala/hmda/api/model/IrsResponse.scala b/...ala/hmda.apiModel/model/IrsResponse.scala → ...in/scala/hmda/api/model/IrsResponse.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.census.model.{ MsaSummary, Msa }
 import hmda.persistence.PaginatedResource

diff --git a/...del/ModifiedLoanApplicationRegister.scala → ...del/ModifiedLoanApplicationRegister.scala b/...del/ModifiedLoanApplicationRegister.scala → ...del/ModifiedLoanApplicationRegister.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.lar.{ Applicant, Denial, Geography, Loan }
 

diff --git a/...da.apiModel/model/PaginatedResponse.scala → ...la/hmda/api/model/PaginatedResponse.scala b/...da.apiModel/model/PaginatedResponse.scala → ...la/hmda/api/model/PaginatedResponse.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.persistence.WithPagination
 

diff --git a/....apiModel/model/ParsingErrorSummary.scala → .../hmda/api/model/ParsingErrorSummary.scala b/....apiModel/model/ParsingErrorSummary.scala → .../hmda/api/model/ParsingErrorSummary.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.SubmissionStatus
 import hmda.model.parser.LarParsingError

diff --git a/...n/scala/hmda.apiModel/model/Receipt.scala → ...c/main/scala/hmda/api/model/Receipt.scala b/...n/scala/hmda.apiModel/model/Receipt.scala → ...c/main/scala/hmda/api/model/Receipt.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.SubmissionStatus
 

diff --git a/...l/model/SingleValidationErrorResult.scala → ...i/model/SingleValidationErrorResult.scala b/...l/model/SingleValidationErrorResult.scala → ...i/model/SingleValidationErrorResult.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.validation.engine.ValidationErrorsSummary
 

diff --git a/...in/scala/hmda.apiModel/model/Status.scala → ...rc/main/scala/hmda/api/model/Status.scala b/...in/scala/hmda.apiModel/model/Status.scala → ...rc/main/scala/hmda/api/model/Status.scala
@@ -1,3 +1,3 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 case class Status(status: String, service: String, time: String, host: String)
diff --git a/...ala/hmda.apiModel/model/Submissions.scala → ...in/scala/hmda/api/model/Submissions.scala b/...ala/hmda.apiModel/model/Submissions.scala → ...in/scala/hmda/api/model/Submissions.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import hmda.model.fi.Submission
 

diff --git a/...itutions/submissions/ContactSummary.scala → ...itutions/submissions/ContactSummary.scala b/...itutions/submissions/ContactSummary.scala → ...itutions/submissions/ContactSummary.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model.institutions.submissions
+package hmda.api.model.institutions.submissions
 
 case class ContactSummary(
   name: String,

diff --git a/...nstitutions/submissions/FileSummary.scala → ...nstitutions/submissions/FileSummary.scala b/...nstitutions/submissions/FileSummary.scala → ...nstitutions/submissions/FileSummary.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model.institutions.submissions
+package hmda.api.model.institutions.submissions
 
 case class FileSummary(
   name: String,

diff --git a/...tions/submissions/RespondentSummary.scala → ...tions/submissions/RespondentSummary.scala b/...tions/submissions/RespondentSummary.scala → ...tions/submissions/RespondentSummary.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model.institutions.submissions
+package hmda.api.model.institutions.submissions
 
 case class RespondentSummary(
   name: String,

diff --git a/...tions/submissions/SubmissionSummary.scala → ...tions/submissions/SubmissionSummary.scala b/...tions/submissions/SubmissionSummary.scala → ...tions/submissions/SubmissionSummary.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model.institutions.submissions
+package hmda.api.model.institutions.submissions
 
 case class SubmissionSummary(
   respondent: RespondentSummary,

diff --git a/...odel/model/public/InstitutionSearch.scala → .../api/model/public/InstitutionSearch.scala b/...odel/model/public/InstitutionSearch.scala → .../api/model/public/InstitutionSearch.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.model.public
+package hmda.api.model.public
 
 import hmda.model.institution.ExternalId
 

diff --git a/...a.apiModel/protocol/HmdaApiProtocol.scala → ...a/hmda/api/protocol/HmdaApiProtocol.scala b/...a.apiModel/protocol/HmdaApiProtocol.scala → ...a/hmda/api/protocol/HmdaApiProtocol.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol
+package hmda.api.protocol
 
 import spray.json.DefaultJsonProtocol
-import hmda.apiModel.model.Status
+import hmda.api.model.Status
 
 trait HmdaApiProtocol extends DefaultJsonProtocol {
   implicit val statusFormat = jsonFormat4(Status.apply)

diff --git a/...ocol/admin/WriteInstitutionProtocol.scala → ...ocol/admin/WriteInstitutionProtocol.scala b/...ocol/admin/WriteInstitutionProtocol.scala → ...ocol/admin/WriteInstitutionProtocol.scala
@@ -1,8 +1,8 @@
-package hmda.apiModel.protocol.admin
+package hmda.api.protocol.admin
 
 import java.util.NoSuchElementException
 
-import hmda.apiModel.protocol.processing.InstitutionProtocol
+import hmda.api.protocol.processing.InstitutionProtocol
 import hmda.model.institution.Agency._
 import hmda.model.institution._
 import spray.json._

diff --git a/...piModel/protocol/fi/lar/LarProtocol.scala → ...mda/api/protocol/fi/lar/LarProtocol.scala b/...piModel/protocol/fi/lar/LarProtocol.scala → ...mda/api/protocol/fi/lar/LarProtocol.scala
@@ -1,4 +1,4 @@
-package hmda.apiModel.protocol.fi.lar
+package hmda.api.protocol.fi.lar
 
 import hmda.model.fi.lar._
 import spray.json.DefaultJsonProtocol

diff --git a/...rotocol/processing/ApiErrorProtocol.scala → ...rotocol/processing/ApiErrorProtocol.scala b/...rotocol/processing/ApiErrorProtocol.scala → ...rotocol/processing/ApiErrorProtocol.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
 import akka.http.scaladsl.model.Uri.Path
-import hmda.apiModel.model.ErrorResponse
+import hmda.api.model.ErrorResponse
 import spray.json.{ DefaultJsonProtocol, DeserializationException, JsString, JsValue, RootJsonFormat }
 
 trait ApiErrorProtocol extends DefaultJsonProtocol {

diff --git a/...ocol/processing/EditResultsProtocol.scala → ...ocol/processing/EditResultsProtocol.scala b/...ocol/processing/EditResultsProtocol.scala → ...ocol/processing/EditResultsProtocol.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.protocol.validation.ValidationResultProtocol
-import hmda.apiModel.model._
+import hmda.api.protocol.validation.ValidationResultProtocol
+import hmda.api.model._
 import spray.json._
 
 trait EditResultsProtocol extends ValidationResultProtocol with SubmissionProtocol with PaginationProtocol {

diff --git a/.../protocol/processing/FilingProtocol.scala → .../protocol/processing/FilingProtocol.scala b/.../protocol/processing/FilingProtocol.scala → .../protocol/processing/FilingProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ FilingDetail, Filings }
+import hmda.api.model.{ FilingDetail, Filings }
 import hmda.model.fi._
 import spray.json.{ DefaultJsonProtocol, DeserializationException, JsNumber, JsObject, JsString, JsValue, RootJsonFormat }
 

diff --git a/...ocol/processing/InstitutionProtocol.scala → ...ocol/processing/InstitutionProtocol.scala b/...ocol/processing/InstitutionProtocol.scala → ...ocol/processing/InstitutionProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ InstitutionDetail, InstitutionWrapper, Institutions }
+import hmda.api.model.{ InstitutionDetail, InstitutionWrapper, Institutions }
 import spray.json.DefaultJsonProtocol
 
 trait InstitutionProtocol extends DefaultJsonProtocol with FilingProtocol {

diff --git a/...del/protocol/processing/MsaProtocol.scala → ...api/protocol/processing/MsaProtocol.scala b/...del/protocol/processing/MsaProtocol.scala → ...api/protocol/processing/MsaProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ IrsResponse, PaginatedResponse }
+import hmda.api.model.{ IrsResponse, PaginatedResponse }
 import hmda.census.model.{ Msa, MsaSummary }
 import spray.json._
 

diff --git a/...tocol/processing/PaginationProtocol.scala → ...tocol/processing/PaginationProtocol.scala b/...tocol/processing/PaginationProtocol.scala → ...tocol/processing/PaginationProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.PaginationLinks
+import hmda.api.model.PaginationLinks
 import spray.json.DefaultJsonProtocol
 
 trait PaginationProtocol extends DefaultJsonProtocol {

diff --git a/...ol/processing/ParserResultsProtocol.scala → ...ol/processing/ParserResultsProtocol.scala b/...ol/processing/ParserResultsProtocol.scala → ...ol/processing/ParserResultsProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ PaginatedResponse, ParsingErrorSummary }
+import hmda.api.model.{ PaginatedResponse, ParsingErrorSummary }
 import hmda.model.fi.SubmissionStatus
 import hmda.model.parser.LarParsingError
 import spray.json._

diff --git a/...tocol/processing/SubmissionProtocol.scala → ...tocol/processing/SubmissionProtocol.scala b/...tocol/processing/SubmissionProtocol.scala → ...tocol/processing/SubmissionProtocol.scala
@@ -1,9 +1,9 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
 import hmda.model.fi._
-import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary }
-import hmda.apiModel.model.{ Receipt, Submissions }
-import hmda.apiModel.protocol.validation.ValidationResultProtocol
+import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary }
+import hmda.api.model.{ Receipt, Submissions }
+import hmda.api.protocol.validation.ValidationResultProtocol
 import spray.json.{ DeserializationException, JsNumber, JsObject, JsString, JsValue, RootJsonFormat }
 
 trait SubmissionProtocol extends ValidationResultProtocol {

diff --git a/...ol/public/InstitutionSearchProtocol.scala → ...ol/public/InstitutionSearchProtocol.scala b/...ol/public/InstitutionSearchProtocol.scala → ...ol/public/InstitutionSearchProtocol.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol.public
+package hmda.api.protocol.public
 
-import hmda.apiModel.model.public.{ InstitutionSearch, InstitutionSearchResults }
-import hmda.apiModel.protocol.admin.WriteInstitutionProtocol
+import hmda.api.model.public.{ InstitutionSearch, InstitutionSearchResults }
+import hmda.api.protocol.admin.WriteInstitutionProtocol
 import hmda.model.institution.ExternalId
 
 trait InstitutionSearchProtocol extends WriteInstitutionProtocol {

diff --git a/...validation/ValidationResultProtocol.scala → ...validation/ValidationResultProtocol.scala b/...validation/ValidationResultProtocol.scala → ...validation/ValidationResultProtocol.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.validation
+package hmda.api.protocol.validation
 
-import hmda.apiModel.model.SingleValidationErrorResult
+import hmda.api.model.SingleValidationErrorResult
 import hmda.model.validation._
 import hmda.validation.engine._
 import spray.json.{ DefaultJsonProtocol, DeserializationException, JsString, JsValue, RootJsonFormat }

diff --git a/...hmda.apiModel/model/ModelGenerators.scala → ...cala/hmda/api/model/ModelGenerators.scala b/...hmda.apiModel/model/ModelGenerators.scala → ...cala/hmda/api/model/ModelGenerators.scala
@@ -1,10 +1,10 @@
-package hmda.apiModel.model
+package hmda.api.model
 
 import java.util.Calendar
 
 import akka.http.scaladsl.model.Uri.Path
-import hmda.apiModel.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary }
-import hmda.apiModel.model.public.InstitutionSearch
+import hmda.api.model.institutions.submissions.{ ContactSummary, FileSummary, RespondentSummary, SubmissionSummary }
+import hmda.api.model.public.InstitutionSearch
 import org.scalacheck.Gen
 import spray.json.{ JsObject, JsString }
 import hmda.model.institution.InstitutionGenerators._

diff --git a/...iModel/protocol/HmdaApiProtocolSpec.scala → ...da/api/protocol/HmdaApiProtocolSpec.scala b/...iModel/protocol/HmdaApiProtocolSpec.scala → ...da/api/protocol/HmdaApiProtocolSpec.scala
@@ -1,8 +1,8 @@
-package hmda.apiModel.protocol
+package hmda.api.protocol
 
 import org.scalatest._
 import prop._
-import hmda.apiModel.model.{ ModelGenerators, Status }
+import hmda.api.model.{ ModelGenerators, Status }
 import spray.json._
 
 class HmdaApiProtocolSpec extends PropSpec with PropertyChecks with MustMatchers with ModelGenerators with HmdaApiProtocol {

diff --git a/.../admin/WriteInstitutionProtocolSpec.scala → .../admin/WriteInstitutionProtocolSpec.scala b/.../admin/WriteInstitutionProtocolSpec.scala → .../admin/WriteInstitutionProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.admin
+package hmda.api.protocol.admin
 
-import hmda.apiModel.model.ModelGenerators
+import hmda.api.model.ModelGenerators
 import hmda.model.institution.InstitutionGenerators._
 import hmda.model.institution.Institution
 import org.scalatest.{ MustMatchers, PropSpec }

diff --git a/...col/processing/ApiErrorProtocolSpec.scala → ...col/processing/ApiErrorProtocolSpec.scala b/...col/processing/ApiErrorProtocolSpec.scala → ...col/processing/ApiErrorProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ ErrorResponse, ModelGenerators }
+import hmda.api.model.{ ErrorResponse, ModelGenerators }
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks
 import spray.json._

diff --git a/.../processing/EditResultsProtocolSpec.scala → .../processing/EditResultsProtocolSpec.scala b/.../processing/EditResultsProtocolSpec.scala → .../processing/EditResultsProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model._
+import hmda.api.model._
 import hmda.model.fi.ValidatedWithErrors
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks

diff --git a/...tocol/processing/FilingProtocolSpec.scala → ...tocol/processing/FilingProtocolSpec.scala b/...tocol/processing/FilingProtocolSpec.scala → ...tocol/processing/FilingProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ FilingDetail, ModelGenerators }
+import hmda.api.model.{ FilingDetail, ModelGenerators }
 import hmda.model.fi.Filing
 import org.scalatest.prop.PropertyChecks
 import org.scalatest.{ MustMatchers, PropSpec }

diff --git a/.../processing/InstitutionProtocolSpec.scala → .../processing/InstitutionProtocolSpec.scala b/.../processing/InstitutionProtocolSpec.scala → .../processing/InstitutionProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ InstitutionWrapper, ModelGenerators }
+import hmda.api.model.{ InstitutionWrapper, ModelGenerators }
 import hmda.model.institution.InstitutionGenerators._
 import org.scalatest.prop.PropertyChecks
 import org.scalatest.{ MustMatchers, PropSpec }

diff --git a/...protocol/processing/MsaProtocolSpec.scala → ...protocol/processing/MsaProtocolSpec.scala b/...protocol/processing/MsaProtocolSpec.scala → ...protocol/processing/MsaProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.IrsResponse
+import hmda.api.model.IrsResponse
 import hmda.census.model.{ Msa, MsaSummary }
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks

diff --git a/...rocessing/ParserResultsProtocolSpec.scala → ...rocessing/ParserResultsProtocolSpec.scala b/...rocessing/ParserResultsProtocolSpec.scala → ...rocessing/ParserResultsProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.{ ModelGenerators, ParsingErrorSummary }
+import hmda.api.model.{ ModelGenerators, ParsingErrorSummary }
 import hmda.model.fi.ParsedWithErrors
 import hmda.model.parser.LarParsingError
 import org.scalatest.{ MustMatchers, PropSpec }

diff --git a/...l/processing/SubmissionProtocolSpec.scala → ...l/processing/SubmissionProtocolSpec.scala b/...l/processing/SubmissionProtocolSpec.scala → ...l/processing/SubmissionProtocolSpec.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol.processing
+package hmda.api.protocol.processing
 
-import hmda.apiModel.model.ModelGenerators
-import hmda.apiModel.model.institutions.submissions.SubmissionSummary
+import hmda.api.model.ModelGenerators
+import hmda.api.model.institutions.submissions.SubmissionSummary
 import hmda.model.fi.Submission
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks

diff --git a/...ublic/InstitutionSearchProtocolSpec.scala → ...ublic/InstitutionSearchProtocolSpec.scala b/...ublic/InstitutionSearchProtocolSpec.scala → ...ublic/InstitutionSearchProtocolSpec.scala
@@ -1,7 +1,7 @@
-package hmda.apiModel.protocol.public
+package hmda.api.protocol.public
 
-import hmda.apiModel.model.ModelGenerators
-import hmda.apiModel.model.public.InstitutionSearch
+import hmda.api.model.ModelGenerators
+import hmda.api.model.public.InstitutionSearch
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks
 import spray.json._

diff --git a/...dation/ValidationResultProtocolSpec.scala → ...dation/ValidationResultProtocolSpec.scala b/...dation/ValidationResultProtocolSpec.scala → ...dation/ValidationResultProtocolSpec.scala
@@ -1,6 +1,6 @@
-package hmda.apiModel.protocol.validation
+package hmda.api.protocol.validation
 
-import hmda.apiModel.model.ModelGenerators
+import hmda.api.model.ModelGenerators
 import hmda.model.validation.ValidationErrorGenerators._
 import hmda.model.validation._
 import org.scalatest.{ MustMatchers, PropSpec }

diff --git a/api/src/main/scala/hmda/api/http/BaseHttpApi.scala b/api/src/main/scala/hmda/api/http/BaseHttpApi.scala
@@ -7,9 +7,9 @@ import akka.event.LoggingAdapter
 import akka.http.scaladsl.marshalling.ToResponseMarshallable
 import akka.http.scaladsl.server.Directives._
 import akka.stream.ActorMaterializer
-import hmda.apiModel.model.Status
+import hmda.api.model.Status
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import hmda.apiModel.protocol.HmdaApiProtocol
+import hmda.api.protocol.HmdaApiProtocol
 import spray.json._
 
 trait BaseHttpApi extends HmdaApiProtocol with HmdaCustomDirectives {

diff --git a/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala b/api/src/main/scala/hmda/api/http/HmdaCustomDirectives.scala
@@ -5,8 +5,8 @@ import akka.http.scaladsl.server.Directives._
 import akka.event.LoggingAdapter
 import akka.http.scaladsl.marshalling.ToResponseMarshallable
 import akka.http.scaladsl.model.{ StatusCodes, Uri }
-import hmda.apiModel.model.ErrorResponse
-import hmda.apiModel.protocol.processing.ApiErrorProtocol
+import hmda.api.model.ErrorResponse
+import hmda.api.protocol.processing.ApiErrorProtocol
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 
 trait HmdaCustomDirectives extends ApiErrorProtocol {

diff --git a/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala b/api/src/main/scala/hmda/api/http/InstitutionsHttpApi.scala
@@ -7,7 +7,7 @@ import akka.stream.ActorMaterializer
 import akka.util.Timeout
 import hmda.api.http.institutions.submissions._
 import hmda.api.http.institutions.{ FilingPaths, InstitutionPaths, UploadPaths }
-import hmda.apiModel.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol }
+import hmda.api.protocol.processing.{ ApiErrorProtocol, InstitutionProtocol }
 
 import scala.concurrent.ExecutionContext