From 9de42c64b9d80d37ee40b96d524f5bd323a10992 Mon Sep 17 00:00:00 2001
From: Jonathan Cole <jon@jcole.io>
Date: Sat, 25 Nov 2023 15:05:27 -0500
Subject: [PATCH] rename Dto classes with Dto in front.  Update some dtos

---
 .../Member/ApCancelTeachInstance/Post.scala   |  10 +-
 .../ApClassInstancesInstructorInfo/Get.scala  |  10 +-
 .../Dto/Member/ApTeachInstance/Post.scala     |  10 +-
 .../Staff/Dockhouse/CreateSignout/Post.scala  |  68 +--
 .../CreateSignoutMultiple/Post.scala          |  84 +--
 .../Dto/Staff/Dockhouse/ScanCard/Get.scala    |  90 +--
 .../ApClassInstances/ThisSeason/Get.scala     |  42 +-
 .../Rest/ApClassSessions/Today/Get.scala      |  74 +--
 .../Dto/Staff/Rest/ApClassTypes/Get.scala     |  26 +-
 .../Dto/Staff/Rest/ClassInstructor/Get.scala  |  22 +
 .../Dto/Staff/Rest/ClassInstructor/Post.scala |  33 ++
 .../Member/SignupTeachApInstance.scala        |   4 +-
 .../Member/UnenrollTeachApInstance.scala      |   4 +-
 .../CreateSignout/CreateSignout.scala         |  20 +-
 .../Staff/Dockhouse/ScanCard/ScanCard.scala   |  26 +-
 .../Staff/Rest/ApClassInstances.scala         |  10 +-
 .../Staff/Rest/ApClassSessions.scala          |  12 +-
 .../Endpoints/Staff/Rest/ApClassTypes.scala   |   8 +-
 .../ClassInstructor/GetClassInstructor.scala  |   8 +-
 .../EntityDefinitions/AccessProfile.scala     |   4 +
 .../AccessProfileRelationship.scala           |   4 +
 .../EntityDefinitions/AccessProfileRole.scala |   4 +
 .../EntityDefinitions/ApClassAttendance.scala |   3 +
 .../EntityDefinitions/ApClassFormat.scala     |   2 +
 .../EntityDefinitions/ApClassInstance.scala   |   2 +
 .../EntityDefinitions/ApClassSession.scala    |   2 +
 .../EntityDefinitions/ApClassSignup.scala     |   2 +
 .../EntityDefinitions/ApClassType.scala       |   2 +
 .../ApClassTypeOverride.scala                 |   4 +
 .../ApClassTypesSeason.scala                  |   4 +
 .../EntityDefinitions/ApClassVoucher.scala    |   4 +
 .../ApClassWaitlistResult.scala               |   3 +
 .../EntityDefinitions/AppIdIndex.scala        |   4 +
 .../EntityDefinitions/AppPrivilege.scala      |   4 +
 .../EntityDefinitions/AppPrivilegeGroup.scala |   4 +
 .../EntityDefinitions/BoatRating.scala        |   3 +
 .../Entities/EntityDefinitions/BoatType.scala |   3 +
 .../EntityDefinitions/BudgetItem.scala        |   3 +
 .../EntityDefinitions/CardDefinition.scala    |   3 +
 .../CardDefinitionType.scala                  |   3 +
 .../EntityDefinitions/CardDismissal.scala     |   3 +
 .../EntityDefinitions/CcErrorCode.scala       |   4 +
 .../Entities/EntityDefinitions/CcLog.scala    |   3 +
 .../EntityDefinitions/ClassInstructor.scala   |   3 +
 .../EntityDefinitions/ClassLocation.scala     |   3 +
 .../EntityDefinitions/CommentsColumn.scala    |   3 +
 .../EntityDefinitions/CommentsTable.scala     |   3 +
 .../EntityDefinitions/ConstCont20140623.scala |   3 +
 .../EntityDefinitions/CorpAttend2013.scala    |   4 +
 .../Entities/EntityDefinitions/Countrie.scala |   3 +
 .../EntityDefinitions/DamageWaiver.scala      |   3 +
 .../EntityDefinitions/DatetimeRange.scala     |   4 +
 .../EntityDefinitions/DeveloperSession.scala  |   4 +
 .../Entities/EntityDefinitions/DhGlobal.scala |   3 +
 .../Entities/EntityDefinitions/Discount.scala |   4 +
 .../EntityDefinitions/DiscountCategorie.scala |   3 +
 .../EntityDefinitions/DiscountCode.scala      |   3 +
 .../EntityDefinitions/DiscountInstance.scala  |   3 +
 .../DiscountInstanceLevel.scala               |   3 +
 .../EntityDefinitions/DiscountMapping.scala   |   3 +
 .../EntityDefinitions/DockReport.scala        |   3 +
 .../EntityDefinitions/DockReportApClass.scala |   3 +
 .../DockReportHullCount.scala                 |   3 +
 .../EntityDefinitions/DockReportStaff.scala   |   3 +
 .../EntityDefinitions/DockReportUapAppt.scala |   3 +
 .../EntityDefinitions/DockReportWeather.scala |   3 +
 .../Entities/EntityDefinitions/Donation.scala |   2 +
 .../EntityDefinitions/DonationFund.scala      |   3 +
 .../DonationInitiative.scala                  |   3 +
 .../DonationSuggestion.scala                  |   3 +
 .../DuplActionPreventionRecord.scala          |   3 +
 .../Entities/EntityDefinitions/EiiMit.scala   |   3 +
 .../EntityDefinitions/EiiOverride.scala       |   3 +
 .../EntityDefinitions/EiiResponse.scala       |   3 +
 .../EntityDefinitions/EmailContent.scala      |   3 +
 .../EntityDefinitions/EmailContentGroup.scala |   3 +
 .../EntityDefinitions/EmailTracking.scala     |   3 +
 .../EntityDefinitions/ErrorType.scala         |   4 +
 .../Entities/EntityDefinitions/Event.scala    |   3 +
 .../Entities/EntityDefinitions/Feedback.scala |   3 +
 .../EntityDefinitions/FlagChange.scala        |   4 +
 .../EntityDefinitions/FlagsGlobal.scala       |   3 +
 .../EntityDefinitions/FoAppliedGc.scala       |   3 +
 .../Entities/EntityDefinitions/FoAr.scala     |   3 +
 .../EntityDefinitions/FoArSource.scala        |   3 +
 .../Entities/EntityDefinitions/FoCash.scala   |   3 +
 .../FoCashDenomination.scala                  |   4 +
 .../EntityDefinitions/FoCashLocation.scala    |   3 +
 .../Entities/EntityDefinitions/FoCheck.scala  |   3 +
 .../Entities/EntityDefinitions/FoClose.scala  |   3 +
 .../EntityDefinitions/FoCloseUser.scala       |   4 +
 .../EntityDefinitions/FoCurrentClose.scala    |   4 +
 .../Entities/EntityDefinitions/FoItem.scala   |   3 +
 .../EntityDefinitions/FoItemCategorie.scala   |   3 +
 .../EntityDefinitions/FoItemType.scala        |   3 +
 .../EntityDefinitions/FoItemTypesLookup.scala |   3 +
 .../EntityDefinitions/FoItemsLookup.scala     |   3 +
 .../Entities/EntityDefinitions/FoMisc.scala   |   3 +
 .../EntityDefinitions/FoMiscLookup.scala      |   3 +
 .../EntityDefinitions/FoParking.scala         |   3 +
 .../EntityDefinitions/GiftCertPurchase.scala  |   3 +
 .../EntityDefinitions/GiftCertState.scala     |   3 +
 .../EntityDefinitions/GiftCertificate.scala   |   3 +
 .../EntityDefinitions/GiftCertsDiscount.scala |   4 +
 .../EntityDefinitions/GlobalConstant.scala    |   4 +
 .../GlobalConstantDataType.scala              |   3 +
 .../GlobalConstantsValue.scala                |   3 +
 .../EntityDefinitions/GuestPriv.scala         |   3 +
 .../EntityDefinitions/HighSchool.scala        |   3 +
 .../EntityDefinitions/HighSchoolFee.scala     |   3 +
 .../EntityDefinitions/HighSchoolPayment.scala |   3 +
 .../EntityDefinitions/InstallmentSale.scala   |   4 +
 .../EntityDefinitions/InstructionQueue.scala  |   3 +
 .../EntityDefinitions/JpClassAttendance.scala |   4 +
 .../EntityDefinitions/JpClassInstance.scala   |   2 +
 .../EntityDefinitions/JpClassSection.scala    |   2 +
 .../JpClassSectionLookup.scala                |   3 +
 .../EntityDefinitions/JpClassSession.scala    |   2 +
 .../EntityDefinitions/JpClassSignup.scala     |   2 +
 .../JpClassSignupsSkill.scala                 |   3 +
 .../EntityDefinitions/JpClassSkill.scala      |   3 +
 .../JpClassSkillsRating.scala                 |   3 +
 .../EntityDefinitions/JpClassStagger.scala    |   2 +
 .../EntityDefinitions/JpClassType.scala       |   3 +
 .../JpClassTypeOverride.scala                 |   3 +
 .../EntityDefinitions/JpClassWlResult.scala   |   3 +
 .../EntityDefinitions/JpClosure.scala         |   3 +
 .../EntityDefinitions/JpEmailTracking.scala   |   4 +
 .../Entities/EntityDefinitions/JpGroup.scala  |   3 +
 .../Entities/EntityDefinitions/JpNoSwim.scala |   3 +
 .../EntityDefinitions/JpReplMapping.scala     |   3 +
 .../EntityDefinitions/JpSpecialNeed.scala     |   3 +
 .../EntityDefinitions/JpSpringWaitlist.scala  |   3 +
 .../Entities/EntityDefinitions/JpTeam.scala   |   3 +
 .../EntityDefinitions/JpTeamEvent.scala       |   3 +
 .../EntityDefinitions/JpTeamEventPoints.scala |   2 +
 .../EntityDefinitions/JpWeather.scala         |   3 +
 .../JpcInstancesDiscount.scala                |   3 +
 .../Entities/EntityDefinitions/Language.scala |   3 +
 .../MemTypesAllowedRating.scala               |   3 +
 .../MemTypesApClassType.scala                 |   4 +
 .../EntityDefinitions/MembershipPrice.scala   |   3 +
 .../EntityDefinitions/MembershipType.scala    |   2 +
 .../MembershipTypeDiscount.scala              |   3 +
 .../EntityDefinitions/MembershipTypeExp.scala |   2 +
 .../MembershipsDiscount.scala                 |   3 +
 .../EntityDefinitions/MergeHistory.scala      |   3 +
 .../EntityDefinitions/OptOutGroup.scala       |   3 +
 .../EntityDefinitions/OptOutRequest.scala     |   3 +
 .../EntityDefinitions/OrderNumber.scala       |   3 +
 .../OrderStaggeredPayment.scala               |   3 +
 .../EntityDefinitions/OrdersPromo.scala       |   3 +
 .../OrdersStripePaymentIntent.scala           |   4 +
 .../Entities/EntityDefinitions/Pa.scala       |   4 +
 .../EntityDefinitions/PerformanceLog.scala    |   3 +
 .../EntityDefinitions/PersonCard.scala        |   3 +
 .../EntityDefinitions/PersonMembership.scala  |   1 +
 .../EntityDefinitions/PersonRating.scala      |   3 +
 .../PersonRelationship.scala                  |   2 +
 .../PersonRelationshipType.scala              |   3 +
 .../EntityDefinitions/PersonTag.scala         |   2 +
 .../EntityDefinitions/PersonType.scala        |   3 +
 .../EntityDefinitions/PersonTypesField.scala  |   3 +
 .../PersonsCardsAlternate.scala               |   3 +
 .../PersonsDiscountsEligible.scala            |   3 +
 .../EntityDefinitions/PersonsEvent.scala      |   3 +
 .../PersonsNotificationPreference.scala       |   3 +
 .../PersonsRecurringDonation.scala            |   4 +
 .../EntityDefinitions/PersonsTemp.scala       |   4 +
 .../EntityDefinitions/PersonsToDelete.scala   |   3 +
 .../EntityDefinitions/Preference.scala        |   3 +
 .../EntityDefinitions/ProgramType.scala       |   3 +
 .../EntityDefinitions/Promotion.scala         |   3 +
 .../Entities/EntityDefinitions/RaCz.scala     |   3 +
 .../Entities/EntityDefinitions/Rating.scala   |   2 +
 .../EntityDefinitions/RatingChange.scala      |   3 +
 .../EntityDefinitions/RatingProgram.scala     |   3 +
 .../EntityDefinitions/ResetPwReq.scala        |   3 +
 .../EntityDefinitions/Restriction.scala       |   3 +
 .../EntityDefinitions/ScheduledDowntime.scala |   4 +
 .../SendgridSuppressionActivity.scala         |   3 +
 .../EntityDefinitions/SessionBlacklist.scala  |   3 +
 .../EntityDefinitions/SessionKey.scala        |   3 +
 .../ShoppingCartApplGc.scala                  |   4 +
 .../ShoppingCartDonation.scala                |   3 +
 .../EntityDefinitions/ShoppingCartGc.scala    |   3 +
 .../ShoppingCartGuestPriv.scala               |   3 +
 .../EntityDefinitions/ShoppingCartJpc.scala   |   3 +
 .../ShoppingCartMembership.scala              |   3 +
 .../ShoppingCartWaiver.scala                  |   3 +
 .../Entities/EntityDefinitions/Signout.scala  |   2 +
 .../EntityDefinitions/SignoutCrew.scala       |   2 +
 .../EntityDefinitions/SignoutTest.scala       |   2 +
 .../EntityDefinitions/SignoutsDebug.scala     |   3 +
 .../EntityDefinitions/SpecialNeed.scala       |   3 +
 .../Entities/EntityDefinitions/State.scala    |   3 +
 .../StripeChargeAttLog.scala                  |   4 +
 .../EntityDefinitions/StripeToken.scala       |   3 +
 .../Entities/EntityDefinitions/Sunset.scala   |   3 +
 .../EntityDefinitions/SunsetTime.scala        |   4 +
 .../EntityDefinitions/SwimProofMethod.scala   |   3 +
 .../EntityDefinitions/SymonSchedule.scala     |   3 +
 .../EntityDefinitions/TableInfo.scala         |   3 +
 .../Entities/EntityDefinitions/Tag.scala      |   3 +
 .../EntityDefinitions/TempMakeIndice.scala    |   4 +
 .../Entities/EntityDefinitions/TextFile.scala |   3 +
 .../EntityDefinitions/UapComment.scala        |   3 +
 .../Entities/EntityDefinitions/UapGroup.scala |   3 +
 .../EntityDefinitions/UapGroupPrice.scala     |   3 +
 .../Entities/EntityDefinitions/User.scala     |   2 +
 .../Entities/EntityDefinitions/UserRole.scala |   3 +
 .../Entities/EntityDefinitions/UsersIp.scala  |   4 +
 .../EntityDefinitions/UsersPreference.scala   |   3 +
 .../EntityDefinitions/VerifyEmailReq.scala    |   4 +
 .../EntityDefinitions/WikiEntrie.scala        |   3 +
 .../EntityDefinitions/YearlyDate.scala        |   3 +
 .../EntityDefinitions/YearlyDateItem.scala    |   3 +
 .../APIServer/IO/Portal/PortalLogic.scala     |   8 +-
 .../CreateSignoutLogic.scala                  |   6 +-
 .../staff/dockhouse/create-signout.ts         |  34 --
 .../io-ts-codec/staff/dockhouse/dh-globals.ts |  30 -
 .../staff/dockhouse/grant-ratings.ts          |  20 -
 .../staff/dockhouse/put-flag-change.ts        |  16 -
 .../io-ts-codec/staff/dockhouse/scan-card.ts  |  67 ---
 .../staff/rest/ap-class-sessions.ts           |  73 ---
 doc/static/swagger/api-staff.yaml             | 534 ------------------
 entity-templates/AcctLink.scala               |  24 -
 entity-templates/ActiveApMember.scala         |  20 -
 entity-templates/ActiveHsMember.scala         |  20 -
 entity-templates/ActiveJpMember.scala         |  20 -
 entity-templates/ActiveStripeToken.scala      |  34 --
 entity-templates/ActiveUapMember.scala        |  20 -
 entity-templates/AllCrew.scala                |  36 --
 entity-templates/ApClassAttendance.scala      |  36 --
 entity-templates/ApClassBookend.scala         |  24 -
 .../ApClassCancellationTime.scala             |  36 --
 entity-templates/ApClassFormat.scala          |  44 --
 entity-templates/ApClassInstance.scala        |  50 --
 entity-templates/ApClassSession.scala         |  42 --
 entity-templates/ApClassSignup.scala          |  60 --
 entity-templates/ApClassType.scala            |  58 --
 entity-templates/ApClassTypeOverride.scala    |  38 --
 entity-templates/ApClassTypesSeason.scala     |  26 -
 entity-templates/ApClassVoucher.scala         |  44 --
 entity-templates/ApClassWlResult.scala        |  40 --
 entity-templates/ApCurrentMembership.scala    |  26 -
 entity-templates/ApDockRpt.scala              | 156 -----
 entity-templates/ApDockRptClasse.scala        |  40 --
 entity-templates/ApDockRptClosure.scala       |  36 --
 entity-templates/ApDockRptRating.scala        |  38 --
 entity-templates/ApDockRptStaff.scala         |  40 --
 entity-templates/ApDockRptWeather.scala       |  48 --
 entity-templates/AppIdIndex.scala             |  36 --
 entity-templates/BoatType.scala               |  42 --
 entity-templates/BoatsRating.scala            |  38 --
 entity-templates/BudgetItem.scala             |  34 --
 entity-templates/CardDefinition.scala         |  30 -
 entity-templates/CardDefinitionType.scala     |  26 -
 entity-templates/CardDismissal.scala          |  34 --
 entity-templates/CcErrorCode.scala            |  38 --
 entity-templates/CcLog.scala                  |  78 ---
 entity-templates/CcTransNumber.scala          |  32 --
 entity-templates/ClassInstructor.scala        |  36 --
 entity-templates/ClassLocation.scala          |  34 --
 entity-templates/CloseArPayment.scala         |  22 -
 entity-templates/CloseDescription.scala       |  22 -
 entity-templates/ClosePkgView.scala           |  34 --
 entity-templates/CloseSummary.scala           |  40 --
 entity-templates/CommentsColumn.scala         |  28 -
 entity-templates/CommentsTable.scala          |  26 -
 entity-templates/ConstCont20140623.scala      |  68 ---
 entity-templates/CorpAttend2013.scala         |  26 -
 entity-templates/Countrie.scala               |  26 -
 entity-templates/CriticalError.scala          |  22 -
 entity-templates/CurrentClose.scala           |  22 -
 entity-templates/DamageWaiver.scala           |  52 --
 entity-templates/DatesWithSeason.scala        |  22 -
 entity-templates/DeveloperSession.scala       |  28 -
 entity-templates/DhGlobal.scala               |  34 --
 entity-templates/Discount.scala               |  36 --
 entity-templates/DiscountActiveInstance.scala |  22 -
 entity-templates/DiscountCategorie.scala      |  32 --
 entity-templates/DiscountCode.scala           |  38 --
 entity-templates/DiscountInstance.scala       |  44 --
 entity-templates/DiscountInstanceLevel.scala  |  34 --
 entity-templates/DiscountMapping.scala        |  24 -
 entity-templates/Donation.scala               |  70 ---
 entity-templates/DonationFund.scala           |  44 --
 entity-templates/DonationInitiative.scala     |  36 --
 entity-templates/DonationSuggestion.scala     |  32 --
 entity-templates/Eii.scala                    |  84 ---
 entity-templates/EiiExtreme.scala             |  22 -
 entity-templates/EiiMit.scala                 |  30 -
 entity-templates/EiiOverride.scala            |  36 --
 entity-templates/EiiResponse.scala            |  64 ---
 entity-templates/EmailContent.scala           |  62 --
 entity-templates/EmailContentGroup.scala      |  32 --
 entity-templates/EmailTracking.scala          |  60 --
 entity-templates/ErrorType.scala              |  28 -
 entity-templates/EstimatedSignin.scala        |  22 -
 entity-templates/Event.scala                  |  38 --
 entity-templates/Feedback.scala               |  40 --
 entity-templates/FlagChange.scala             |  34 --
 entity-templates/FlagsGlobal.scala            |  34 --
 entity-templates/FoAlert.scala                |  20 -
 entity-templates/FoAppliedGc.scala            |  42 --
 entity-templates/FoAr.scala                   |  36 --
 entity-templates/FoArSource.scala             |  40 --
 entity-templates/FoCash.scala                 |  38 --
 entity-templates/FoCashDenomination.scala     |  26 -
 entity-templates/FoCashLocation.scala         |  28 -
 entity-templates/FoCheck.scala                |  42 --
 entity-templates/FoCheckWithX.scala           |  28 -
 entity-templates/FoClose.scala                |  58 --
 entity-templates/FoCloseUser.scala            |  34 --
 entity-templates/FoCurrentClose.scala         |  26 -
 entity-templates/FoItem.scala                 |  44 --
 entity-templates/FoItemCategorie.scala        |  32 --
 entity-templates/FoItemType.scala             |  44 --
 entity-templates/FoItemTypesLookup.scala      |  38 --
 entity-templates/FoItemsLookup.scala          |  44 --
 entity-templates/FoMisc.scala                 |  46 --
 entity-templates/FoMiscLookup.scala           |  40 --
 entity-templates/FoParking.scala              |  40 --
 entity-templates/FoRegCode.scala              |  36 --
 entity-templates/FoRetailId.scala             |  24 -
 entity-templates/FullCart.scala               |  36 --
 entity-templates/FyExpiration.scala           |  22 -
 entity-templates/GiftCertCurrentState.scala   |  38 --
 entity-templates/GiftCertPurchase.scala       |  84 ---
 entity-templates/GiftCertState.scala          |  40 --
 entity-templates/GiftCertificate.scala        |  36 --
 .../GiftCertsActiveDiscount.scala             |  24 -
 .../GiftCertsAvailableDiscount.scala          |  24 -
 entity-templates/GiftCertsDiscount.scala      |  34 --
 entity-templates/GlobalConstant.scala         |  34 --
 entity-templates/GlobalConstantDataType.scala |  24 -
 entity-templates/GlobalConstantsValue.scala   |  38 --
 entity-templates/GuestPriv.scala              |  48 --
 entity-templates/HighSchool.scala             |  36 --
 entity-templates/HighSchoolFee.scala          |  42 --
 entity-templates/HighSchoolPayment.scala      |  48 --
 entity-templates/HtmldbPlanTable.scala        |  88 ---
 entity-templates/IncomeLevel.scala            |  34 --
 entity-templates/IndiegogoDonation.scala      |  60 --
 entity-templates/InstallmentSale.scala        |  30 -
 entity-templates/InstructionQueue.scala       |  46 --
 entity-templates/JpClassAttendance.scala      |  36 --
 entity-templates/JpClassBookend.scala         |  24 -
 entity-templates/JpClassBookendsOld.scala     |  24 -
 entity-templates/JpClassInstance.scala        |  56 --
 entity-templates/JpClassLatestSkill.scala     |  32 --
 entity-templates/JpClassSection.scala         |  38 --
 entity-templates/JpClassSectionLookup.scala   |  38 --
 entity-templates/JpClassSession.scala         |  36 --
 entity-templates/JpClassSignup.scala          |  70 ---
 entity-templates/JpClassSignupsSkill.scala    |  42 --
 entity-templates/JpClassSkill.scala           |  40 --
 entity-templates/JpClassSkillsRating.scala    |  36 --
 entity-templates/JpClassStagger.scala         |  40 --
 entity-templates/JpClassType.scala            |  56 --
 entity-templates/JpClassTypeOverride.scala    |  38 --
 entity-templates/JpClassWlResult.scala        |  42 --
 entity-templates/JpClosure.scala              |  36 --
 entity-templates/JpDockRpt.scala              |  70 ---
 entity-templates/JpEmailTracking.scala        |  48 --
 entity-templates/JpGroup.scala                |  35 --
 entity-templates/JpNoSwim.scala               |  32 --
 entity-templates/JpRatingsGranted.scala       |  36 --
 entity-templates/JpReplMapping.scala          |  34 --
 entity-templates/JpReserve.scala              |  22 -
 entity-templates/JpSpecialNeed.scala          |  34 --
 entity-templates/JpSpecialNeedsByWeek.scala   |  32 --
 entity-templates/JpSpecialNeedsCopy.scala     |  32 --
 entity-templates/JpSpringWaitlist.scala       |  36 --
 entity-templates/JpTeam.scala                 |  36 --
 entity-templates/JpTeamEvent.scala            |  36 --
 entity-templates/JpTeamEventPoint.scala       |  28 -
 entity-templates/JpWeather.scala              |  48 --
 entity-templates/JpWeek.scala                 |  28 -
 entity-templates/JpcInstancesDiscount.scala   |  38 --
 entity-templates/Language.scala               |  24 -
 entity-templates/M2ToHelm.scala               |  26 -
 entity-templates/MemTypesAllowedRating.scala  |  26 -
 entity-templates/MemTypesApClassType.scala    |  24 -
 entity-templates/MembershipPrice.scala        |  38 --
 entity-templates/MembershipType.scala         |  68 ---
 entity-templates/MembershipTypeDiscount.scala |  38 --
 entity-templates/MembershipTypeExp.scala      |  38 --
 entity-templates/MembershipsDiscount.scala    |  48 --
 entity-templates/MergeHistory.scala           |  40 --
 entity-templates/MostRecentSignout.scala      |  24 -
 entity-templates/OneDaySignoutsToday.scala    |  20 -
 entity-templates/OpenStaggeredOrder.scala     |  24 -
 entity-templates/OptOutGroup.scala            |  32 --
 entity-templates/OptOutRequest.scala          |  38 --
 entity-templates/OrderNumber.scala            |  46 --
 entity-templates/OrderStaggeredPayment.scala  |  44 --
 entity-templates/OrdersPromo.scala            |  34 --
 .../OrdersStripePaymentIntent.scala           |  32 --
 entity-templates/Pa.scala                     |  32 --
 entity-templates/PendingMembership.scala      |  28 -
 entity-templates/PerformanceLog.scala         |  38 --
 entity-templates/Person.scala                 | 222 --------
 entity-templates/PersonLastExpiration.scala   |  22 -
 entity-templates/PersonRelationship.scala     |  36 --
 entity-templates/PersonRelationshipType.scala |  36 --
 entity-templates/PersonType.scala             |  36 --
 entity-templates/PersonTypesField.scala       |  36 --
 entity-templates/PersonsBoatsFlag.scala       |  28 -
 entity-templates/PersonsBoatsFlagsMax.scala   |  26 -
 entity-templates/PersonsCard.scala            |  54 --
 entity-templates/PersonsCardsAlternate.scala  |  54 --
 .../PersonsDiscountsEligible.scala            |  36 --
 entity-templates/PersonsEvent.scala           |  34 --
 entity-templates/PersonsMembership.scala      |  88 ---
 entity-templates/PersonsRating.scala          |  38 --
 .../PersonsRecurringDonation.scala            |  32 --
 entity-templates/PersonsTag.scala             |  34 --
 entity-templates/PersonsTemp.scala            | 168 ------
 entity-templates/PersonsToDelete.scala        |  26 -
 entity-templates/Preference.scala             |  36 --
 entity-templates/ProgramType.scala            |  38 --
 entity-templates/Promotion.scala              |  40 --
 entity-templates/RaCz.scala                   |  36 --
 entity-templates/Rating.scala                 |  44 --
 entity-templates/RatingChange.scala           |  44 --
 entity-templates/RatingsProgram.scala         |  34 --
 entity-templates/ResetPwReq.scala             |  38 --
 entity-templates/Restriction.scala            |  32 --
 entity-templates/ScheduledDowntime.scala      |  26 -
 .../SendgridSuppressionActivity.scala         |  36 --
 entity-templates/SequenceInfo.scala           |  26 -
 entity-templates/SessionBlacklist.scala       |  34 --
 entity-templates/SessionKey.scala             |  36 --
 entity-templates/ShoppingCartApplGc.scala     |  36 --
 entity-templates/ShoppingCartDonation.scala   |  42 --
 entity-templates/ShoppingCartGc.scala         |  68 ---
 entity-templates/ShoppingCartGuestPriv.scala  |  38 --
 entity-templates/ShoppingCartJpc.scala        |  44 --
 entity-templates/ShoppingCartMembership.scala |  52 --
 .../ShoppingCartMembershipsArch.scala         |  50 --
 entity-templates/ShoppingCartWaiver.scala     |  36 --
 entity-templates/Signout.scala                |  76 ---
 entity-templates/SignoutCrew.scala            |  48 --
 entity-templates/SignoutSnapshot.scala        |  50 --
 entity-templates/SignoutsDebug.scala          |  80 ---
 entity-templates/SignupsWithAttendance.scala  |  34 --
 entity-templates/SpecialNeed.scala            |  48 --
 entity-templates/StaggeredPaymentsReady.scala |  34 --
 entity-templates/State.scala                  |  26 -
 .../StripeBalanceTransaction.scala            |  40 --
 entity-templates/StripeCharge.scala           |  42 --
 entity-templates/StripeChargeAttLog.scala     |  50 --
 entity-templates/StripePayout.scala           |  30 -
 entity-templates/StripeRefund.scala           |  28 -
 entity-templates/StripeToken.scala            |  38 --
 entity-templates/Sunset.scala                 |  24 -
 entity-templates/SwimProofMethod.scala        |  36 --
 entity-templates/SymonRun.scala               |  38 --
 entity-templates/SymonSchedule.scala          |  40 --
 entity-templates/TableInfo.scala              |  34 --
 entity-templates/Tag.scala                    |  36 --
 entity-templates/TempMakeIndice.scala         |  26 -
 entity-templates/TempNoshow.scala             |  24 -
 entity-templates/TextFile.scala               |  36 --
 entity-templates/TodaysSignout.scala          |  72 ---
 entity-templates/UapComment.scala             |  32 --
 entity-templates/UapGroup.scala               |  34 --
 entity-templates/UapGroupPrice.scala          |  36 --
 entity-templates/UngrantedTable.scala         |  20 -
 entity-templates/UnitTestScratch.scala        |  34 --
 entity-templates/User.scala                   |  60 --
 entity-templates/UserPreferenceValue.scala    |  26 -
 entity-templates/UsersIp.scala                |  30 -
 entity-templates/UsersPreference.scala        |  36 --
 entity-templates/ValidPerson.scala            |  20 -
 entity-templates/VerifyEmailReq.scala         |  32 --
 entity-templates/WikiEntrie.scala             |  36 --
 entity-templates/YearlyDate.scala             |  38 --
 entity-templates/YearlyDateItem.scala         |  38 --
 entity-templates/ZKeepalive.scala             |  22 -
 482 files changed, 925 insertions(+), 11114 deletions(-)
 create mode 100644 app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Get.scala
 create mode 100644 app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Post.scala
 delete mode 100644 doc/static/io-ts-codec/staff/dockhouse/create-signout.ts
 delete mode 100644 doc/static/io-ts-codec/staff/dockhouse/dh-globals.ts
 delete mode 100644 doc/static/io-ts-codec/staff/dockhouse/grant-ratings.ts
 delete mode 100644 doc/static/io-ts-codec/staff/dockhouse/put-flag-change.ts
 delete mode 100644 doc/static/io-ts-codec/staff/dockhouse/scan-card.ts
 delete mode 100644 doc/static/io-ts-codec/staff/rest/ap-class-sessions.ts
 delete mode 100644 doc/static/swagger/api-staff.yaml
 delete mode 100644 entity-templates/AcctLink.scala
 delete mode 100644 entity-templates/ActiveApMember.scala
 delete mode 100644 entity-templates/ActiveHsMember.scala
 delete mode 100644 entity-templates/ActiveJpMember.scala
 delete mode 100644 entity-templates/ActiveStripeToken.scala
 delete mode 100644 entity-templates/ActiveUapMember.scala
 delete mode 100644 entity-templates/AllCrew.scala
 delete mode 100644 entity-templates/ApClassAttendance.scala
 delete mode 100644 entity-templates/ApClassBookend.scala
 delete mode 100644 entity-templates/ApClassCancellationTime.scala
 delete mode 100644 entity-templates/ApClassFormat.scala
 delete mode 100644 entity-templates/ApClassInstance.scala
 delete mode 100644 entity-templates/ApClassSession.scala
 delete mode 100644 entity-templates/ApClassSignup.scala
 delete mode 100644 entity-templates/ApClassType.scala
 delete mode 100644 entity-templates/ApClassTypeOverride.scala
 delete mode 100644 entity-templates/ApClassTypesSeason.scala
 delete mode 100644 entity-templates/ApClassVoucher.scala
 delete mode 100644 entity-templates/ApClassWlResult.scala
 delete mode 100644 entity-templates/ApCurrentMembership.scala
 delete mode 100644 entity-templates/ApDockRpt.scala
 delete mode 100644 entity-templates/ApDockRptClasse.scala
 delete mode 100644 entity-templates/ApDockRptClosure.scala
 delete mode 100644 entity-templates/ApDockRptRating.scala
 delete mode 100644 entity-templates/ApDockRptStaff.scala
 delete mode 100644 entity-templates/ApDockRptWeather.scala
 delete mode 100644 entity-templates/AppIdIndex.scala
 delete mode 100644 entity-templates/BoatType.scala
 delete mode 100644 entity-templates/BoatsRating.scala
 delete mode 100644 entity-templates/BudgetItem.scala
 delete mode 100644 entity-templates/CardDefinition.scala
 delete mode 100644 entity-templates/CardDefinitionType.scala
 delete mode 100644 entity-templates/CardDismissal.scala
 delete mode 100644 entity-templates/CcErrorCode.scala
 delete mode 100644 entity-templates/CcLog.scala
 delete mode 100644 entity-templates/CcTransNumber.scala
 delete mode 100644 entity-templates/ClassInstructor.scala
 delete mode 100644 entity-templates/ClassLocation.scala
 delete mode 100644 entity-templates/CloseArPayment.scala
 delete mode 100644 entity-templates/CloseDescription.scala
 delete mode 100644 entity-templates/ClosePkgView.scala
 delete mode 100644 entity-templates/CloseSummary.scala
 delete mode 100644 entity-templates/CommentsColumn.scala
 delete mode 100644 entity-templates/CommentsTable.scala
 delete mode 100644 entity-templates/ConstCont20140623.scala
 delete mode 100644 entity-templates/CorpAttend2013.scala
 delete mode 100644 entity-templates/Countrie.scala
 delete mode 100644 entity-templates/CriticalError.scala
 delete mode 100644 entity-templates/CurrentClose.scala
 delete mode 100644 entity-templates/DamageWaiver.scala
 delete mode 100644 entity-templates/DatesWithSeason.scala
 delete mode 100644 entity-templates/DeveloperSession.scala
 delete mode 100644 entity-templates/DhGlobal.scala
 delete mode 100644 entity-templates/Discount.scala
 delete mode 100644 entity-templates/DiscountActiveInstance.scala
 delete mode 100644 entity-templates/DiscountCategorie.scala
 delete mode 100644 entity-templates/DiscountCode.scala
 delete mode 100644 entity-templates/DiscountInstance.scala
 delete mode 100644 entity-templates/DiscountInstanceLevel.scala
 delete mode 100644 entity-templates/DiscountMapping.scala
 delete mode 100644 entity-templates/Donation.scala
 delete mode 100644 entity-templates/DonationFund.scala
 delete mode 100644 entity-templates/DonationInitiative.scala
 delete mode 100644 entity-templates/DonationSuggestion.scala
 delete mode 100644 entity-templates/Eii.scala
 delete mode 100644 entity-templates/EiiExtreme.scala
 delete mode 100644 entity-templates/EiiMit.scala
 delete mode 100644 entity-templates/EiiOverride.scala
 delete mode 100644 entity-templates/EiiResponse.scala
 delete mode 100644 entity-templates/EmailContent.scala
 delete mode 100644 entity-templates/EmailContentGroup.scala
 delete mode 100644 entity-templates/EmailTracking.scala
 delete mode 100644 entity-templates/ErrorType.scala
 delete mode 100644 entity-templates/EstimatedSignin.scala
 delete mode 100644 entity-templates/Event.scala
 delete mode 100644 entity-templates/Feedback.scala
 delete mode 100644 entity-templates/FlagChange.scala
 delete mode 100644 entity-templates/FlagsGlobal.scala
 delete mode 100644 entity-templates/FoAlert.scala
 delete mode 100644 entity-templates/FoAppliedGc.scala
 delete mode 100644 entity-templates/FoAr.scala
 delete mode 100644 entity-templates/FoArSource.scala
 delete mode 100644 entity-templates/FoCash.scala
 delete mode 100644 entity-templates/FoCashDenomination.scala
 delete mode 100644 entity-templates/FoCashLocation.scala
 delete mode 100644 entity-templates/FoCheck.scala
 delete mode 100644 entity-templates/FoCheckWithX.scala
 delete mode 100644 entity-templates/FoClose.scala
 delete mode 100644 entity-templates/FoCloseUser.scala
 delete mode 100644 entity-templates/FoCurrentClose.scala
 delete mode 100644 entity-templates/FoItem.scala
 delete mode 100644 entity-templates/FoItemCategorie.scala
 delete mode 100644 entity-templates/FoItemType.scala
 delete mode 100644 entity-templates/FoItemTypesLookup.scala
 delete mode 100644 entity-templates/FoItemsLookup.scala
 delete mode 100644 entity-templates/FoMisc.scala
 delete mode 100644 entity-templates/FoMiscLookup.scala
 delete mode 100644 entity-templates/FoParking.scala
 delete mode 100644 entity-templates/FoRegCode.scala
 delete mode 100644 entity-templates/FoRetailId.scala
 delete mode 100644 entity-templates/FullCart.scala
 delete mode 100644 entity-templates/FyExpiration.scala
 delete mode 100644 entity-templates/GiftCertCurrentState.scala
 delete mode 100644 entity-templates/GiftCertPurchase.scala
 delete mode 100644 entity-templates/GiftCertState.scala
 delete mode 100644 entity-templates/GiftCertificate.scala
 delete mode 100644 entity-templates/GiftCertsActiveDiscount.scala
 delete mode 100644 entity-templates/GiftCertsAvailableDiscount.scala
 delete mode 100644 entity-templates/GiftCertsDiscount.scala
 delete mode 100644 entity-templates/GlobalConstant.scala
 delete mode 100644 entity-templates/GlobalConstantDataType.scala
 delete mode 100644 entity-templates/GlobalConstantsValue.scala
 delete mode 100644 entity-templates/GuestPriv.scala
 delete mode 100644 entity-templates/HighSchool.scala
 delete mode 100644 entity-templates/HighSchoolFee.scala
 delete mode 100644 entity-templates/HighSchoolPayment.scala
 delete mode 100644 entity-templates/HtmldbPlanTable.scala
 delete mode 100644 entity-templates/IncomeLevel.scala
 delete mode 100644 entity-templates/IndiegogoDonation.scala
 delete mode 100644 entity-templates/InstallmentSale.scala
 delete mode 100644 entity-templates/InstructionQueue.scala
 delete mode 100644 entity-templates/JpClassAttendance.scala
 delete mode 100644 entity-templates/JpClassBookend.scala
 delete mode 100644 entity-templates/JpClassBookendsOld.scala
 delete mode 100644 entity-templates/JpClassInstance.scala
 delete mode 100644 entity-templates/JpClassLatestSkill.scala
 delete mode 100644 entity-templates/JpClassSection.scala
 delete mode 100644 entity-templates/JpClassSectionLookup.scala
 delete mode 100644 entity-templates/JpClassSession.scala
 delete mode 100644 entity-templates/JpClassSignup.scala
 delete mode 100644 entity-templates/JpClassSignupsSkill.scala
 delete mode 100644 entity-templates/JpClassSkill.scala
 delete mode 100644 entity-templates/JpClassSkillsRating.scala
 delete mode 100644 entity-templates/JpClassStagger.scala
 delete mode 100644 entity-templates/JpClassType.scala
 delete mode 100644 entity-templates/JpClassTypeOverride.scala
 delete mode 100644 entity-templates/JpClassWlResult.scala
 delete mode 100644 entity-templates/JpClosure.scala
 delete mode 100644 entity-templates/JpDockRpt.scala
 delete mode 100644 entity-templates/JpEmailTracking.scala
 delete mode 100644 entity-templates/JpGroup.scala
 delete mode 100644 entity-templates/JpNoSwim.scala
 delete mode 100644 entity-templates/JpRatingsGranted.scala
 delete mode 100644 entity-templates/JpReplMapping.scala
 delete mode 100644 entity-templates/JpReserve.scala
 delete mode 100644 entity-templates/JpSpecialNeed.scala
 delete mode 100644 entity-templates/JpSpecialNeedsByWeek.scala
 delete mode 100644 entity-templates/JpSpecialNeedsCopy.scala
 delete mode 100644 entity-templates/JpSpringWaitlist.scala
 delete mode 100644 entity-templates/JpTeam.scala
 delete mode 100644 entity-templates/JpTeamEvent.scala
 delete mode 100644 entity-templates/JpTeamEventPoint.scala
 delete mode 100644 entity-templates/JpWeather.scala
 delete mode 100644 entity-templates/JpWeek.scala
 delete mode 100644 entity-templates/JpcInstancesDiscount.scala
 delete mode 100644 entity-templates/Language.scala
 delete mode 100644 entity-templates/M2ToHelm.scala
 delete mode 100644 entity-templates/MemTypesAllowedRating.scala
 delete mode 100644 entity-templates/MemTypesApClassType.scala
 delete mode 100644 entity-templates/MembershipPrice.scala
 delete mode 100644 entity-templates/MembershipType.scala
 delete mode 100644 entity-templates/MembershipTypeDiscount.scala
 delete mode 100644 entity-templates/MembershipTypeExp.scala
 delete mode 100644 entity-templates/MembershipsDiscount.scala
 delete mode 100644 entity-templates/MergeHistory.scala
 delete mode 100644 entity-templates/MostRecentSignout.scala
 delete mode 100644 entity-templates/OneDaySignoutsToday.scala
 delete mode 100644 entity-templates/OpenStaggeredOrder.scala
 delete mode 100644 entity-templates/OptOutGroup.scala
 delete mode 100644 entity-templates/OptOutRequest.scala
 delete mode 100644 entity-templates/OrderNumber.scala
 delete mode 100644 entity-templates/OrderStaggeredPayment.scala
 delete mode 100644 entity-templates/OrdersPromo.scala
 delete mode 100644 entity-templates/OrdersStripePaymentIntent.scala
 delete mode 100644 entity-templates/Pa.scala
 delete mode 100644 entity-templates/PendingMembership.scala
 delete mode 100644 entity-templates/PerformanceLog.scala
 delete mode 100644 entity-templates/Person.scala
 delete mode 100644 entity-templates/PersonLastExpiration.scala
 delete mode 100644 entity-templates/PersonRelationship.scala
 delete mode 100644 entity-templates/PersonRelationshipType.scala
 delete mode 100644 entity-templates/PersonType.scala
 delete mode 100644 entity-templates/PersonTypesField.scala
 delete mode 100644 entity-templates/PersonsBoatsFlag.scala
 delete mode 100644 entity-templates/PersonsBoatsFlagsMax.scala
 delete mode 100644 entity-templates/PersonsCard.scala
 delete mode 100644 entity-templates/PersonsCardsAlternate.scala
 delete mode 100644 entity-templates/PersonsDiscountsEligible.scala
 delete mode 100644 entity-templates/PersonsEvent.scala
 delete mode 100644 entity-templates/PersonsMembership.scala
 delete mode 100644 entity-templates/PersonsRating.scala
 delete mode 100644 entity-templates/PersonsRecurringDonation.scala
 delete mode 100644 entity-templates/PersonsTag.scala
 delete mode 100644 entity-templates/PersonsTemp.scala
 delete mode 100644 entity-templates/PersonsToDelete.scala
 delete mode 100644 entity-templates/Preference.scala
 delete mode 100644 entity-templates/ProgramType.scala
 delete mode 100644 entity-templates/Promotion.scala
 delete mode 100644 entity-templates/RaCz.scala
 delete mode 100644 entity-templates/Rating.scala
 delete mode 100644 entity-templates/RatingChange.scala
 delete mode 100644 entity-templates/RatingsProgram.scala
 delete mode 100644 entity-templates/ResetPwReq.scala
 delete mode 100644 entity-templates/Restriction.scala
 delete mode 100644 entity-templates/ScheduledDowntime.scala
 delete mode 100644 entity-templates/SendgridSuppressionActivity.scala
 delete mode 100644 entity-templates/SequenceInfo.scala
 delete mode 100644 entity-templates/SessionBlacklist.scala
 delete mode 100644 entity-templates/SessionKey.scala
 delete mode 100644 entity-templates/ShoppingCartApplGc.scala
 delete mode 100644 entity-templates/ShoppingCartDonation.scala
 delete mode 100644 entity-templates/ShoppingCartGc.scala
 delete mode 100644 entity-templates/ShoppingCartGuestPriv.scala
 delete mode 100644 entity-templates/ShoppingCartJpc.scala
 delete mode 100644 entity-templates/ShoppingCartMembership.scala
 delete mode 100644 entity-templates/ShoppingCartMembershipsArch.scala
 delete mode 100644 entity-templates/ShoppingCartWaiver.scala
 delete mode 100644 entity-templates/Signout.scala
 delete mode 100644 entity-templates/SignoutCrew.scala
 delete mode 100644 entity-templates/SignoutSnapshot.scala
 delete mode 100644 entity-templates/SignoutsDebug.scala
 delete mode 100644 entity-templates/SignupsWithAttendance.scala
 delete mode 100644 entity-templates/SpecialNeed.scala
 delete mode 100644 entity-templates/StaggeredPaymentsReady.scala
 delete mode 100644 entity-templates/State.scala
 delete mode 100644 entity-templates/StripeBalanceTransaction.scala
 delete mode 100644 entity-templates/StripeCharge.scala
 delete mode 100644 entity-templates/StripeChargeAttLog.scala
 delete mode 100644 entity-templates/StripePayout.scala
 delete mode 100644 entity-templates/StripeRefund.scala
 delete mode 100644 entity-templates/StripeToken.scala
 delete mode 100644 entity-templates/Sunset.scala
 delete mode 100644 entity-templates/SwimProofMethod.scala
 delete mode 100644 entity-templates/SymonRun.scala
 delete mode 100644 entity-templates/SymonSchedule.scala
 delete mode 100644 entity-templates/TableInfo.scala
 delete mode 100644 entity-templates/Tag.scala
 delete mode 100644 entity-templates/TempMakeIndice.scala
 delete mode 100644 entity-templates/TempNoshow.scala
 delete mode 100644 entity-templates/TextFile.scala
 delete mode 100644 entity-templates/TodaysSignout.scala
 delete mode 100644 entity-templates/UapComment.scala
 delete mode 100644 entity-templates/UapGroup.scala
 delete mode 100644 entity-templates/UapGroupPrice.scala
 delete mode 100644 entity-templates/UngrantedTable.scala
 delete mode 100644 entity-templates/UnitTestScratch.scala
 delete mode 100644 entity-templates/User.scala
 delete mode 100644 entity-templates/UserPreferenceValue.scala
 delete mode 100644 entity-templates/UsersIp.scala
 delete mode 100644 entity-templates/UsersPreference.scala
 delete mode 100644 entity-templates/ValidPerson.scala
 delete mode 100644 entity-templates/VerifyEmailReq.scala
 delete mode 100644 entity-templates/WikiEntrie.scala
 delete mode 100644 entity-templates/YearlyDate.scala
 delete mode 100644 entity-templates/YearlyDateItem.scala
 delete mode 100644 entity-templates/ZKeepalive.scala

diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApCancelTeachInstance/Post.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApCancelTeachInstance/Post.scala
index 8dd5bed3..5f1d19cb 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApCancelTeachInstance/Post.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApCancelTeachInstance/Post.scala
@@ -10,13 +10,13 @@ import play.api.libs.json.{JsValue, Json}
  */
 
 
-case class MemberApCancelTeachInstancePostRequestDto (
+case class DtoMemberApCancelTeachInstancePostRequest (
 	instanceId: Int,
 )
 
-object MemberApCancelTeachInstancePostRequestDto {
-	implicit val format = Json.format[MemberApCancelTeachInstancePostRequestDto]
-	def apply(v: JsValue): MemberApCancelTeachInstancePostRequestDto
-		= v.as[MemberApCancelTeachInstancePostRequestDto]
+object DtoMemberApCancelTeachInstancePostRequest {
+	implicit val format = Json.format[DtoMemberApCancelTeachInstancePostRequest]
+	def apply(v: JsValue): DtoMemberApCancelTeachInstancePostRequest
+		= v.as[DtoMemberApCancelTeachInstancePostRequest]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApClassInstancesInstructorInfo/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApClassInstancesInstructorInfo/Get.scala
index 5c76672d..48ed2c67 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApClassInstancesInstructorInfo/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApClassInstancesInstructorInfo/Get.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class MemberApClassInstancesInstructorInfoGetResponseSuccessDto (
+case class DtoMemberApClassInstancesInstructorInfoGetResponseSuccess (
 	instanceId: Int,
 	instructorName: Option[String],
 	signupCt: Int,
@@ -16,9 +16,9 @@ case class MemberApClassInstancesInstructorInfoGetResponseSuccessDto (
 	signupMax: Option[Int],
 )
 
-object MemberApClassInstancesInstructorInfoGetResponseSuccessDto {
-	implicit val format = Json.format[MemberApClassInstancesInstructorInfoGetResponseSuccessDto]
-	def apply(v: JsValue): MemberApClassInstancesInstructorInfoGetResponseSuccessDto
-		= v.as[MemberApClassInstancesInstructorInfoGetResponseSuccessDto]
+object DtoMemberApClassInstancesInstructorInfoGetResponseSuccess {
+	implicit val format = Json.format[DtoMemberApClassInstancesInstructorInfoGetResponseSuccess]
+	def apply(v: JsValue): DtoMemberApClassInstancesInstructorInfoGetResponseSuccess
+		= v.as[DtoMemberApClassInstancesInstructorInfoGetResponseSuccess]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApTeachInstance/Post.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApTeachInstance/Post.scala
index 4c4ff721..651f6da4 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApTeachInstance/Post.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Member/ApTeachInstance/Post.scala
@@ -10,13 +10,13 @@ import play.api.libs.json.{JsValue, Json}
  */
 
 
-case class MemberApTeachInstancePostRequestDto (
+case class DtoMemberApTeachInstancePostRequest (
 	instanceId: Int,
 )
 
-object MemberApTeachInstancePostRequestDto {
-	implicit val format = Json.format[MemberApTeachInstancePostRequestDto]
-	def apply(v: JsValue): MemberApTeachInstancePostRequestDto
-		= v.as[MemberApTeachInstancePostRequestDto]
+object DtoMemberApTeachInstancePostRequest {
+	implicit val format = Json.format[DtoMemberApTeachInstancePostRequest]
+	def apply(v: JsValue): DtoMemberApTeachInstancePostRequest
+		= v.as[DtoMemberApTeachInstancePostRequest]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignout/Post.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignout/Post.scala
index e686eaf5..c9b3c382 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignout/Post.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignout/Post.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffDockhouseCreateSignoutPostResponseSuccessDto (
+case class DtoStaffDockhouseCreateSignoutPostResponseSuccess (
 	signoutId: Int,
 	personId: Option[Int],
 	programId: Int,
@@ -21,47 +21,47 @@ case class StaffDockhouseCreateSignoutPostResponseSuccessDto (
 	testResult: Option[String],
 	isQueued: Boolean,
 	signoutDatetime: Option[String],
-	$$crew: List[StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew],
-	$$tests: List[StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests],
+	$$crew: List[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew],
+	$$tests: List[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests],
 )
 
-case class StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew (
+case class DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew (
 	signoutId: Int,
 	personId: Option[Int],
 	cardNum: Option[String],
 	startActive: Option[String],
 )
 
-object StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew
-		= v.as[StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew]
+object DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew
+		= v.as[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew]
 }
 
-case class StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests (
+case class DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests (
 	signoutId: Int,
 	personId: Int,
 	ratingId: Int,
 )
 
-object StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests
-		= v.as[StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests]
+object DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests
+		= v.as[DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests]
 }
 
-object StaffDockhouseCreateSignoutPostResponseSuccessDto {
-	implicit val StaffDockhouseCreateSignoutPostResponseSuccessDto_CrewFormat
-		= StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew.format
-	implicit val StaffDockhouseCreateSignoutPostResponseSuccessDto_TestsFormat
-		= StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests.format
-	implicit val format = Json.format[StaffDockhouseCreateSignoutPostResponseSuccessDto]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutPostResponseSuccessDto
-		= v.as[StaffDockhouseCreateSignoutPostResponseSuccessDto]
+object DtoStaffDockhouseCreateSignoutPostResponseSuccess {
+	implicit val DtoStaffDockhouseCreateSignoutPostResponseSuccess_CrewFormat
+		= DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew.format
+	implicit val DtoStaffDockhouseCreateSignoutPostResponseSuccess_TestsFormat
+		= DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests.format
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutPostResponseSuccess]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutPostResponseSuccess
+		= v.as[DtoStaffDockhouseCreateSignoutPostResponseSuccess]
 }
 
 
-case class StaffDockhouseCreateSignoutPostRequestDto (
+case class DtoStaffDockhouseCreateSignoutPostRequest (
 	skipperPersonId: Int,
 	programId: Int,
 	skipperCardNumber: String,
@@ -73,26 +73,26 @@ case class StaffDockhouseCreateSignoutPostRequestDto (
 	isRacing: Boolean,
 	dockmasterOverride: Boolean,
 	didInformKayakRules: Boolean,
-	signoutCrew: List[StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew],
+	signoutCrew: List[DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew],
 )
 
-case class StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew (
+case class DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew (
 	personId: Int,
 	cardNumber: String,
 	testRatingId: Option[Int],
 )
 
-object StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew
-		= v.as[StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew]
+object DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew
+		= v.as[DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew]
 }
 
-object StaffDockhouseCreateSignoutPostRequestDto {
-	implicit val StaffDockhouseCreateSignoutPostRequestDto_SignoutCrewFormat
-		= StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew.format
-	implicit val format = Json.format[StaffDockhouseCreateSignoutPostRequestDto]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutPostRequestDto
-		= v.as[StaffDockhouseCreateSignoutPostRequestDto]
+object DtoStaffDockhouseCreateSignoutPostRequest {
+	implicit val DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrewFormat
+		= DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew.format
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutPostRequest]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutPostRequest
+		= v.as[DtoStaffDockhouseCreateSignoutPostRequest]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignoutMultiple/Post.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignoutMultiple/Post.scala
index c4508e79..b9bf61c5 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignoutMultiple/Post.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/CreateSignoutMultiple/Post.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto (
+case class DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess (
 	signoutId: Int,
 	personId: Option[Int],
 	programId: Int,
@@ -21,51 +21,51 @@ case class StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto (
 	testResult: Option[String],
 	isQueued: Boolean,
 	signoutDatetime: Option[String],
-	$$crew: List[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew],
-	$$tests: List[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests],
+	$$crew: List[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew],
+	$$tests: List[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests],
 )
 
-case class StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew (
+case class DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew (
 	signoutId: Int,
 	personId: Option[Int],
 	cardNum: Option[String],
 	startActive: Option[String],
 )
 
-object StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew
-		= v.as[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew]
+object DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew]
 }
 
-case class StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests (
+case class DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests (
 	signoutId: Int,
 	personId: Int,
 	ratingId: Int,
 )
 
-object StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests
-		= v.as[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests]
+object DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests]
 }
 
-object StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto {
-	implicit val StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_CrewFormat
-		= StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Crew.format
-	implicit val StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_TestsFormat
-		= StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto_Tests.format
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto
-		= v.as[StaffDockhouseCreateSignoutMultiplePostResponseSuccessDto]
+object DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess {
+	implicit val DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_CrewFormat
+		= DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Crew.format
+	implicit val DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_TestsFormat
+		= DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess_Tests.format
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostResponseSuccess]
 }
 
 
-case class StaffDockhouseCreateSignoutMultiplePostRequestDto (
-	signouts: List[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts],
+case class DtoStaffDockhouseCreateSignoutMultiplePostRequest (
+	signouts: List[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts],
 )
 
-case class StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts (
+case class DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts (
 	skipperPersonId: Int,
 	programId: Int,
 	skipperCardNumber: String,
@@ -77,34 +77,34 @@ case class StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts (
 	isRacing: Boolean,
 	dockmasterOverride: Boolean,
 	didInformKayakRules: Boolean,
-	signoutCrew: List[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew],
+	signoutCrew: List[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew],
 )
 
-case class StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew (
+case class DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew (
 	personId: Int,
 	cardNumber: String,
 	testRatingId: Option[Int],
 )
 
-object StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew {
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew
-		= v.as[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew]
+object DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew {
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew]
 }
 
-object StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts {
-	implicit val StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrewFormat
-		= StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew.format
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts
-		= v.as[StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts]
+object DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts {
+	implicit val DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrewFormat
+		= DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew.format
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts]
 }
 
-object StaffDockhouseCreateSignoutMultiplePostRequestDto {
-	implicit val StaffDockhouseCreateSignoutMultiplePostRequestDto_SignoutsFormat
-		= StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts.format
-	implicit val format = Json.format[StaffDockhouseCreateSignoutMultiplePostRequestDto]
-	def apply(v: JsValue): StaffDockhouseCreateSignoutMultiplePostRequestDto
-		= v.as[StaffDockhouseCreateSignoutMultiplePostRequestDto]
+object DtoStaffDockhouseCreateSignoutMultiplePostRequest {
+	implicit val DtoStaffDockhouseCreateSignoutMultiplePostRequest_SignoutsFormat
+		= DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts.format
+	implicit val format = Json.format[DtoStaffDockhouseCreateSignoutMultiplePostRequest]
+	def apply(v: JsValue): DtoStaffDockhouseCreateSignoutMultiplePostRequest
+		= v.as[DtoStaffDockhouseCreateSignoutMultiplePostRequest]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/ScanCard/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/ScanCard/Get.scala
index a6e73b24..acdf4254 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/ScanCard/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Dockhouse/ScanCard/Get.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffDockhouseScanCardGetResponseSuccessDto (
+case class DtoStaffDockhouseScanCardGetResponseSuccess (
 	personId: Int,
 	cardNumber: String,
 	nameFirst: Option[String],
@@ -16,14 +16,14 @@ case class StaffDockhouseScanCardGetResponseSuccessDto (
 	bannerComment: Option[String],
 	specialNeeds: Option[String],
 	signoutBlockReason: Option[String],
-	activeMemberships: List[StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships],
-	personRatings: List[StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings],
-	apClassSignupsToday: List[StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday],
-	jpClassSignupsToday: List[StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday],
-	maxFlagsPerBoat: List[StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat],
+	activeMemberships: List[DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships],
+	personRatings: List[DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings],
+	apClassSignupsToday: List[DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday],
+	jpClassSignupsToday: List[DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday],
+	maxFlagsPerBoat: List[DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat],
 )
 
-case class StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships (
+case class DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships (
 	assignId: Int,
 	membershipTypeId: Int,
 	startDate: Option[String],
@@ -34,26 +34,26 @@ case class StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships (
 	programId: Int,
 )
 
-object StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships {
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships]
+object DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships {
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships]
 }
 
-case class StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings (
+case class DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings (
 	ratingId: Int,
 	programId: Int,
 	ratingName: String,
 	status: String,
 )
 
-object StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings {
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings]
+object DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings {
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings]
 }
 
-case class StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday (
+case class DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday (
 	signupId: Int,
 	instanceId: Int,
 	personId: Int,
@@ -62,13 +62,13 @@ case class StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday (
 	sequence: Int,
 )
 
-object StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday {
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday]
+object DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday {
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday]
 }
 
-case class StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday (
+case class DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday (
 	signupId: Int,
 	instanceId: Int,
 	personId: Int,
@@ -77,37 +77,37 @@ case class StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday (
 	sequence: Double,
 )
 
-object StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday {
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday]
+object DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday {
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday]
 }
 
-case class StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat (
+case class DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat (
 	boatId: Int,
 	programId: Int,
 	maxFlag: String,
 )
 
-object StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat {
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat]
+object DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat {
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat]
 }
 
-object StaffDockhouseScanCardGetResponseSuccessDto {
-	implicit val StaffDockhouseScanCardGetResponseSuccessDto_ActiveMembershipsFormat
-		= StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships.format
-	implicit val StaffDockhouseScanCardGetResponseSuccessDto_PersonRatingsFormat
-		= StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings.format
-	implicit val StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsTodayFormat
-		= StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday.format
-	implicit val StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsTodayFormat
-		= StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday.format
-	implicit val StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoatFormat
-		= StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat.format
-	implicit val format = Json.format[StaffDockhouseScanCardGetResponseSuccessDto]
-	def apply(v: JsValue): StaffDockhouseScanCardGetResponseSuccessDto
-		= v.as[StaffDockhouseScanCardGetResponseSuccessDto]
+object DtoStaffDockhouseScanCardGetResponseSuccess {
+	implicit val DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMembershipsFormat
+		= DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships.format
+	implicit val DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatingsFormat
+		= DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings.format
+	implicit val DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsTodayFormat
+		= DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday.format
+	implicit val DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsTodayFormat
+		= DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday.format
+	implicit val DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoatFormat
+		= DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat.format
+	implicit val format = Json.format[DtoStaffDockhouseScanCardGetResponseSuccess]
+	def apply(v: JsValue): DtoStaffDockhouseScanCardGetResponseSuccess
+		= v.as[DtoStaffDockhouseScanCardGetResponseSuccess]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassInstances/ThisSeason/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassInstances/ThisSeason/Get.scala
index 3ab85f63..6a66cbf3 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassInstances/ThisSeason/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassInstances/ThisSeason/Get.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffRestApClassInstancesThisSeasonGetResponseSuccessDto (
+case class DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess (
 	instanceId: Int,
 	cancelledDatetime: Option[String],
 	signupsStartOverride: Option[String],
@@ -21,11 +21,11 @@ case class StaffRestApClassInstancesThisSeasonGetResponseSuccessDto (
 	locationString: Option[String],
 	doNotAutoCancel: Boolean,
 	instructorId: Option[Int],
-	$$apClassSessions: List[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions],
-	$$instructor: Option[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor],
+	$$apClassSessions: List[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions],
+	$$instructor: Option[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor],
 )
 
-case class StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions (
+case class DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions (
 	sessionId: Int,
 	instanceId: Int,
 	headcount: Option[Int],
@@ -35,31 +35,31 @@ case class StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessi
 	isMakeup: Boolean,
 )
 
-object StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions {
-	implicit val format = Json.format[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions]
-	def apply(v: JsValue): StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions
-		= v.as[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions]
+object DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions {
+	implicit val format = Json.format[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions]
+	def apply(v: JsValue): DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions
+		= v.as[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions]
 }
 
-case class StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor (
+case class DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor (
 	personId: Int,
 	nameFirst: Option[String],
 	nameLast: Option[String],
 )
 
-object StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor {
-	implicit val format = Json.format[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor]
-	def apply(v: JsValue): StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor
-		= v.as[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor]
+object DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor {
+	implicit val format = Json.format[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor]
+	def apply(v: JsValue): DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor
+		= v.as[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor]
 }
 
-object StaffRestApClassInstancesThisSeasonGetResponseSuccessDto {
-	implicit val StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessionsFormat
-		= StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions.format
-	implicit val StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_InstructorFormat
-		= StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor.format
-	implicit val format = Json.format[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto]
-	def apply(v: JsValue): StaffRestApClassInstancesThisSeasonGetResponseSuccessDto
-		= v.as[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto]
+object DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess {
+	implicit val DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessionsFormat
+		= DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions.format
+	implicit val DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_InstructorFormat
+		= DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor.format
+	implicit val format = Json.format[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess]
+	def apply(v: JsValue): DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess
+		= v.as[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
index 6e2d33ec..ac4e105b 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassSessions/Today/Get.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffRestApClassSessionsTodayGetResponseSuccessDto (
+case class DtoStaffRestApClassSessionsTodayGetResponseSuccess (
 	sessionId: Int,
 	instanceId: Int,
 	headcount: Option[Int],
@@ -16,10 +16,10 @@ case class StaffRestApClassSessionsTodayGetResponseSuccessDto (
 	sessionDatetime: String,
 	sessionLength: Double,
 	isMakeup: Boolean,
-	$$apClassInstance: StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance,
+	$$apClassInstance: DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance,
 )
 
-case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance (
+case class DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance (
 	instanceId: Int,
 	cancelledDatetime: Option[String],
 	signupsStartOverride: Option[String],
@@ -31,10 +31,10 @@ case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance (
 	cancelByOverride: Option[String],
 	locationString: Option[String],
 	doNotAutoCancel: Boolean,
-	$$apClassSignups: List[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups],
+	$$apClassSignups: List[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups],
 )
 
-case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups (
+case class DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups (
 	instanceId: Int,
 	discountInstanceId: Option[Int],
 	voidedOnline: Boolean,
@@ -51,23 +51,23 @@ case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_Ap
 	signupType: String,
 	signupNote: Option[String],
 	signupDatetime: String,
-	$$person: StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person,
-	$$apClassWaitlistResult: Option[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult],
+	$$person: DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person,
+	$$apClassWaitlistResult: Option[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult],
 )
 
-case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person (
+case class DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person (
 	personId: Int,
 	nameFirst: Option[String],
 	nameLast: Option[String],
 )
 
-object StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person {
-	implicit val format = Json.format[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person]
-	def apply(v: JsValue): StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person
-		= v.as[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person]
+object DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person {
+	implicit val format = Json.format[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person]
+	def apply(v: JsValue): DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person
+		= v.as[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person]
 }
 
-case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult (
+case class DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult (
 	wlResult: String,
 	foVmDatetime: Option[String],
 	offerExpDatetime: String,
@@ -76,35 +76,35 @@ case class StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_Ap
 	permitOvercrowd: Boolean,
 )
 
-object StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult {
-	implicit val format = Json.format[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult]
-	def apply(v: JsValue): StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult
-		= v.as[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult]
+object DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult {
+	implicit val format = Json.format[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult]
+	def apply(v: JsValue): DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult
+		= v.as[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult]
 }
 
-object StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups {
-	implicit val StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_PersonFormat
-		= StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person.format
-	implicit val StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResultFormat
-		= StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult.format
-	implicit val format = Json.format[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups]
-	def apply(v: JsValue): StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups
-		= v.as[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups]
+object DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups {
+	implicit val DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_PersonFormat
+		= DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person.format
+	implicit val DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResultFormat
+		= DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult.format
+	implicit val format = Json.format[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups]
+	def apply(v: JsValue): DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups
+		= v.as[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups]
 }
 
-object StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance {
-	implicit val StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignupsFormat
-		= StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups.format
-	implicit val format = Json.format[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance]
-	def apply(v: JsValue): StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance
-		= v.as[StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance]
+object DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance {
+	implicit val DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignupsFormat
+		= DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups.format
+	implicit val format = Json.format[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance]
+	def apply(v: JsValue): DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance
+		= v.as[DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance]
 }
 
-object StaffRestApClassSessionsTodayGetResponseSuccessDto {
-	implicit val StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstanceFormat
-		= StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance.format
-	implicit val format = Json.format[StaffRestApClassSessionsTodayGetResponseSuccessDto]
-	def apply(v: JsValue): StaffRestApClassSessionsTodayGetResponseSuccessDto
-		= v.as[StaffRestApClassSessionsTodayGetResponseSuccessDto]
+object DtoStaffRestApClassSessionsTodayGetResponseSuccess {
+	implicit val DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstanceFormat
+		= DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance.format
+	implicit val format = Json.format[DtoStaffRestApClassSessionsTodayGetResponseSuccess]
+	def apply(v: JsValue): DtoStaffRestApClassSessionsTodayGetResponseSuccess
+		= v.as[DtoStaffRestApClassSessionsTodayGetResponseSuccess]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
index f2531675..df2a97b9 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ApClassTypes/Get.scala
@@ -8,7 +8,7 @@ import play.api.libs.json.{JsValue, Json}
  * Do not manually alter this file, or your changes will be lost
  * !!!!!!!!!!!!
  */
-case class StaffRestApClassTypesGetResponseSuccessDto (
+case class DtoStaffRestApClassTypesGetResponseSuccess (
 	typeId: Int,
 	typeName: String,
 	ratingPrereq: Option[Int],
@@ -23,10 +23,10 @@ case class StaffRestApClassTypesGetResponseSuccessDto (
 	signupMaxDefault: Option[Int],
 	signupMinDefault: Option[Int],
 	disallowIfOverkill: Boolean,
-	$$apClassFormats: List[StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats],
+	$$apClassFormats: List[DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats],
 )
 
-case class StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats (
+case class DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats (
 	formatId: Int,
 	typeId: Int,
 	description: Option[String],
@@ -37,17 +37,17 @@ case class StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats (
 	signupMinDefaultOverride: Option[Int],
 )
 
-object StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats {
-	implicit val format = Json.format[StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats]
-	def apply(v: JsValue): StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats
-		= v.as[StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats]
+object DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats {
+	implicit val format = Json.format[DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats]
+	def apply(v: JsValue): DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats
+		= v.as[DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats]
 }
 
-object StaffRestApClassTypesGetResponseSuccessDto {
-	implicit val StaffRestApClassTypesGetResponseSuccessDto_ApClassFormatsFormat
-		= StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats.format
-	implicit val format = Json.format[StaffRestApClassTypesGetResponseSuccessDto]
-	def apply(v: JsValue): StaffRestApClassTypesGetResponseSuccessDto
-		= v.as[StaffRestApClassTypesGetResponseSuccessDto]
+object DtoStaffRestApClassTypesGetResponseSuccess {
+	implicit val DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormatsFormat
+		= DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats.format
+	implicit val format = Json.format[DtoStaffRestApClassTypesGetResponseSuccess]
+	def apply(v: JsValue): DtoStaffRestApClassTypesGetResponseSuccess
+		= v.as[DtoStaffRestApClassTypesGetResponseSuccess]
 }
 
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Get.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Get.scala
new file mode 100644
index 00000000..c2b5dc9d
--- /dev/null
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Get.scala
@@ -0,0 +1,22 @@
+package org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ClassInstructor
+
+import play.api.libs.json.{JsValue, Json}
+
+/**
+ * !!!!!!!!!!!!
+ * This file is AUTO-GENERATED by cbidb-schema
+ * Do not manually alter this file, or your changes will be lost
+ * !!!!!!!!!!!!
+ */
+case class DtoStaffRestClassInstructorGetResponseSuccess (
+	instructorId: Int,
+	nameFirst: String,
+	nameLast: String,
+)
+
+object DtoStaffRestClassInstructorGetResponseSuccess {
+	implicit val format = Json.format[DtoStaffRestClassInstructorGetResponseSuccess]
+	def apply(v: JsValue): DtoStaffRestClassInstructorGetResponseSuccess
+		= v.as[DtoStaffRestClassInstructorGetResponseSuccess]
+}
+
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Post.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Post.scala
new file mode 100644
index 00000000..9fce7faf
--- /dev/null
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Dto/Staff/Rest/ClassInstructor/Post.scala
@@ -0,0 +1,33 @@
+package org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ClassInstructor
+
+import play.api.libs.json.{JsValue, Json}
+
+/**
+ * !!!!!!!!!!!!
+ * This file is AUTO-GENERATED by cbidb-schema
+ * Do not manually alter this file, or your changes will be lost
+ * !!!!!!!!!!!!
+ */
+case class DtoStaffRestClassInstructorPostResponseSuccess (
+	instructorId: Int,
+)
+
+object DtoStaffRestClassInstructorPostResponseSuccess {
+	implicit val format = Json.format[DtoStaffRestClassInstructorPostResponseSuccess]
+	def apply(v: JsValue): DtoStaffRestClassInstructorPostResponseSuccess
+		= v.as[DtoStaffRestClassInstructorPostResponseSuccess]
+}
+
+
+case class DtoStaffRestClassInstructorPostRequest (
+	instructorId: Int,
+	nameFirst: String,
+	nameLast: String,
+)
+
+object DtoStaffRestClassInstructorPostRequest {
+	implicit val format = Json.format[DtoStaffRestClassInstructorPostRequest]
+	def apply(v: JsValue): DtoStaffRestClassInstructorPostRequest
+		= v.as[DtoStaffRestClassInstructorPostRequest]
+}
+
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Member/SignupTeachApInstance.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Member/SignupTeachApInstance.scala
index 6bec2f05..5f242841 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Member/SignupTeachApInstance.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Member/SignupTeachApInstance.scala
@@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Member
 
 import com.coleji.neptune.API.ValidationResult
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApTeachInstance.MemberApTeachInstancePostRequestDto
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApTeachInstance.DtoMemberApTeachInstancePostRequest
 import org.sailcbi.APIServer.IO.Portal.PortalLogic
 import org.sailcbi.APIServer.UserTypes.MemberRequestCache
 import play.api.libs.ws.WSClient
@@ -16,7 +16,7 @@ class SignupTeachApInstance @Inject()(ws: WSClient)(implicit val exec: Execution
 		val parsedRequest = ParsedRequest(request)
 		PA.withRequestCache(MemberRequestCache)(None, parsedRequest, rc => {
 			val personId = rc.getAuthedPersonId
-			PA.withParsedPostBodyJSON(request.body.asJson, MemberApTeachInstancePostRequestDto.apply)(parsed => {
+			PA.withParsedPostBodyJSON(request.body.asJson, DtoMemberApTeachInstancePostRequest.apply)(parsed => {
 				PortalLogic.attemptSignupTeachApClass(rc, personId, parsed.instanceId) match {
 					case None => Future(Ok("OK"))
 					case Some(s) => Future(BadRequest(ValidationResult.from(s).toResultError.asJsObject))
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Member/UnenrollTeachApInstance.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Member/UnenrollTeachApInstance.scala
index 0970db56..fc2e2911 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Member/UnenrollTeachApInstance.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Member/UnenrollTeachApInstance.scala
@@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Member
 
 import com.coleji.neptune.API.ValidationResult
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApTeachInstance.MemberApTeachInstancePostRequestDto
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApTeachInstance.DtoMemberApTeachInstancePostRequest
 import org.sailcbi.APIServer.IO.Portal.PortalLogic
 import org.sailcbi.APIServer.UserTypes.MemberRequestCache
 import play.api.libs.ws.WSClient
@@ -16,7 +16,7 @@ class UnenrollTeachApInstance @Inject()(ws: WSClient)(implicit val exec: Executi
 		val parsedRequest = ParsedRequest(request)
 		PA.withRequestCache(MemberRequestCache)(None, parsedRequest, rc => {
 			val personId = rc.getAuthedPersonId
-			PA.withParsedPostBodyJSON(request.body.asJson, MemberApTeachInstancePostRequestDto.apply)(parsed => {
+			PA.withParsedPostBodyJSON(request.body.asJson, DtoMemberApTeachInstancePostRequest.apply)(parsed => {
 				PortalLogic.attemptUnenrollTeachApClass(rc, personId, parsed.instanceId) match {
 					case None => Future(Ok("OK"))
 					case Some(s) => Future(BadRequest(ValidationResult.from(s).toResultError.asJsObject))
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/CreateSignout/CreateSignout.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/CreateSignout/CreateSignout.scala
index 4834b127..3368b651 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/CreateSignout/CreateSignout.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/CreateSignout/CreateSignout.scala
@@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.CreateSignout
 
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
 import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignout._
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignoutMultiple.{StaffDockhouseCreateSignoutMultiplePostRequestDto, StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts, StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew}
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignoutMultiple.{DtoStaffDockhouseCreateSignoutMultiplePostRequest, DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts, DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew}
 import org.sailcbi.APIServer.Entities.EntityDefinitions.Signout
 import org.sailcbi.APIServer.Logic.DockhouseLogic.CreateSignoutLogic.{CreateSignoutError, CreateSignoutLogic}
 import org.sailcbi.APIServer.UserTypes.StaffRequestCache
@@ -16,7 +16,7 @@ class CreateSignout @Inject()(implicit val exec: ExecutionContext) extends Injec
 	def post()(implicit PA: PermissionsAuthority): Action[AnyContent] = Action.async(req => {
 		val parsedRequest = ParsedRequest(req)
 		PA.withRequestCache(StaffRequestCache)(None, parsedRequest, rc => {
-			PA.withParsedPostBodyJSON(parsedRequest.postJSON, StaffDockhouseCreateSignoutPostRequestDto.apply)(parsed => {
+			PA.withParsedPostBodyJSON(parsedRequest.postJSON, DtoStaffDockhouseCreateSignoutPostRequest.apply)(parsed => {
 				CreateSignoutLogic.attemptSignout(rc, parsed).fold(
 					e => Future(BadRequest(e.asJsObject)),
 					s => Future(Ok(Json.toJson(mapSignoutToOutputDto(s))))
@@ -28,7 +28,7 @@ class CreateSignout @Inject()(implicit val exec: ExecutionContext) extends Injec
 	def postMany()(implicit PA: PermissionsAuthority): Action[AnyContent] = Action.async(req => {
 		val parsedRequest = ParsedRequest(req)
 		PA.withRequestCache(StaffRequestCache)(None, parsedRequest, rc => {
-			PA.withParsedPostBodyJSON(parsedRequest.postJSON, StaffDockhouseCreateSignoutMultiplePostRequestDto.apply)(parsed => {
+			PA.withParsedPostBodyJSON(parsedRequest.postJSON, DtoStaffDockhouseCreateSignoutMultiplePostRequest.apply)(parsed => {
 				// try each signout, rollback if any return an error
 				val result = rc.withTransaction(() => {
 					parsed.signouts.foldLeft(Right(List.empty).asInstanceOf[Either[CreateSignoutError, List[Signout]]])((e, s) => e match {
@@ -48,7 +48,7 @@ class CreateSignout @Inject()(implicit val exec: ExecutionContext) extends Injec
 		})
 	})
 
-	private def mapSignoutToOutputDto(s: Signout): StaffDockhouseCreateSignoutPostResponseSuccessDto = new StaffDockhouseCreateSignoutPostResponseSuccessDto(
+	private def mapSignoutToOutputDto(s: Signout): DtoStaffDockhouseCreateSignoutPostResponseSuccess = new DtoStaffDockhouseCreateSignoutPostResponseSuccess(
 		signoutId = s.values.signoutId.get,
 		personId = s.values.personId.get,
 		programId = s.values.programId.get,
@@ -61,21 +61,21 @@ class CreateSignout @Inject()(implicit val exec: ExecutionContext) extends Injec
 		testResult = None,
 		isQueued = s.values.isQueued.get,
 		signoutDatetime = s.values.signoutDatetime.get.map(_.toString),
-		$$crew = s.references.crew.get.toList.map(c => new StaffDockhouseCreateSignoutPostResponseSuccessDto_Crew(
+		$$crew = s.references.crew.get.toList.map(c => new DtoStaffDockhouseCreateSignoutPostResponseSuccess_Crew(
 			signoutId = c.values.signoutId.get,
 			personId = c.values.personId.get,
 			cardNum = c.values.cardNum.get,
 			startActive = c.values.startActive.get.map(_.toString)
 		)),
-		$$tests = s.references.tests.peek.map(_.toList.map(t => new StaffDockhouseCreateSignoutPostResponseSuccessDto_Tests(
+		$$tests = s.references.tests.peek.map(_.toList.map(t => new DtoStaffDockhouseCreateSignoutPostResponseSuccess_Tests(
 			signoutId = t.values.signoutId.get,
 			personId = t.values.personId.get,
 			ratingId = t.values.ratingId.get
 		))).getOrElse(List.empty)
 	)
 
-	private def multipleDtoToSingleDtoSignout(s: StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts): StaffDockhouseCreateSignoutPostRequestDto
-		= new StaffDockhouseCreateSignoutPostRequestDto(
+	private def multipleDtoToSingleDtoSignout(s: DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts): DtoStaffDockhouseCreateSignoutPostRequest
+		= new DtoStaffDockhouseCreateSignoutPostRequest(
 			skipperPersonId = s.skipperPersonId,
 			programId = s.programId,
 			skipperCardNumber = s.skipperCardNumber,
@@ -90,8 +90,8 @@ class CreateSignout @Inject()(implicit val exec: ExecutionContext) extends Injec
 			signoutCrew = s.signoutCrew.map(multipleDtoToSingleDtoCrew)
 		)
 
-	private def multipleDtoToSingleDtoCrew(c: StaffDockhouseCreateSignoutMultiplePostRequestDto_Signouts_SignoutCrew): StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew
-		= new StaffDockhouseCreateSignoutPostRequestDto_SignoutCrew(
+	private def multipleDtoToSingleDtoCrew(c: DtoStaffDockhouseCreateSignoutMultiplePostRequest_Signouts_SignoutCrew): DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew
+		= new DtoStaffDockhouseCreateSignoutPostRequest_SignoutCrew(
 			personId = c.personId,
 			cardNumber = c.cardNumber,
 			testRatingId = c.testRatingId
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/ScanCard/ScanCard.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/ScanCard/ScanCard.scala
index a7c264a1..9efa8d81 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/ScanCard/ScanCard.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Dockhouse/ScanCard/ScanCard.scala
@@ -31,7 +31,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		})
 	})
 
-	private def scanCard(rc: UnlockedRequestCache, cardNumber: String): Either[ResultError, StaffDockhouseScanCardGetResponseSuccessDto] = {
+	private def scanCard(rc: UnlockedRequestCache, cardNumber: String): Either[ResultError, DtoStaffDockhouseScanCardGetResponseSuccess] = {
 		for(
 			_ <- validateCardNumber(cardNumber);
 			pc <- lookupCard(rc, cardNumber);
@@ -62,10 +62,10 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		}
 	}
 
-	private def constructMemberships(rc: UnlockedRequestCache, personId: Int): List[StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships] = {
+	private def constructMemberships(rc: UnlockedRequestCache, personId: Int): List[DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships] = {
 		GetPersonMembership.getAllForPerson(rc, personId)
 		.filter(MembershipLogic.isActive(_, LocalDate.now))
-		.map(pm => new StaffDockhouseScanCardGetResponseSuccessDto_ActiveMemberships(
+		.map(pm => new DtoStaffDockhouseScanCardGetResponseSuccess_ActiveMemberships(
 			assignId = pm.values.assignId.get,
 			membershipTypeId = pm.values.membershipTypeId.get,
 			startDate = pm.values.startDate.get.map(_.toString),
@@ -77,7 +77,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		))
 	}
 
-	private def constructRatings(rc: UnlockedRequestCache, personId: Int): List[StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings] = {
+	private def constructRatings(rc: UnlockedRequestCache, personId: Int): List[DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings] = {
 		val ratingsQb = QueryBuilder
 			.from(PersonRating)
 			.innerJoin(Rating, Rating.fields.ratingId.alias.equalsField(PersonRating.fields.ratingId.alias))
@@ -91,7 +91,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		rc.executeQueryBuilder(ratingsQb).map(qbrr => {
 			val pr = PersonRating.construct(qbrr)
 
-			new StaffDockhouseScanCardGetResponseSuccessDto_PersonRatings(
+			new DtoStaffDockhouseScanCardGetResponseSuccess_PersonRatings(
 				ratingId = pr.values.ratingId.get,
 				programId = pr.values.programId.get,
 				ratingName = Rating.construct(qbrr).values.ratingName.get,
@@ -106,7 +106,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		})
 	}
 
-	private def constructApClassSignups(rc: UnlockedRequestCache, personId: Int): List[StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday] = {
+	private def constructApClassSignups(rc: UnlockedRequestCache, personId: Int): List[DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday] = {
 		val qb = QueryBuilder
 			.from(ApClassSignup)
 			.innerJoin(ApClassSession, ApClassSession.fields.instanceId.alias.equalsField(ApClassSignup.fields.instanceId))
@@ -122,7 +122,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 				ApClassSignup.fields.signupDatetime,
 				ApClassSignup.fields.sequence,
 			))
-		rc.executeQueryBuilder(qb).map(ApClassSignup.construct).map(s => new StaffDockhouseScanCardGetResponseSuccessDto_ApClassSignupsToday(
+		rc.executeQueryBuilder(qb).map(ApClassSignup.construct).map(s => new DtoStaffDockhouseScanCardGetResponseSuccess_ApClassSignupsToday(
 			signupId = s.values.signupId.get,
 			instanceId = s.values.instanceId.get,
 			personId = s.values.personId.get,
@@ -132,7 +132,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		))
 	}
 
-	private def constructJpClassSignups(rc: UnlockedRequestCache, personId: Int): List[StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday] = {
+	private def constructJpClassSignups(rc: UnlockedRequestCache, personId: Int): List[DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday] = {
 		val qb = QueryBuilder
 			.from(JpClassSignup)
 			.innerJoin(JpClassSession, JpClassSession.fields.instanceId.alias.equalsField(JpClassSignup.fields.instanceId))
@@ -148,7 +148,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 				JpClassSignup.fields.signupDatetime,
 				JpClassSignup.fields.sequence,
 			))
-		rc.executeQueryBuilder(qb).map(JpClassSignup.construct).map(s => new StaffDockhouseScanCardGetResponseSuccessDto_JpClassSignupsToday(
+		rc.executeQueryBuilder(qb).map(JpClassSignup.construct).map(s => new DtoStaffDockhouseScanCardGetResponseSuccess_JpClassSignupsToday(
 			signupId = s.values.signupId.get,
 			instanceId = s.values.instanceId.get,
 			personId = s.values.personId.get,
@@ -158,7 +158,7 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 		))
 	}
 
-	private def constructResult(rc: UnlockedRequestCache, pc: PersonCard): Either[ResultError, StaffDockhouseScanCardGetResponseSuccessDto] = {
+	private def constructResult(rc: UnlockedRequestCache, pc: PersonCard): Either[ResultError, DtoStaffDockhouseScanCardGetResponseSuccess] = {
 		val person = rc.getObjectById(Person, pc.values.personId.get, Set(
 			Person.fields.personId,
 			Person.fields.nameFirst,
@@ -187,14 +187,14 @@ class ScanCard @Inject()(implicit val exec: ExecutionContext) extends InjectedCo
 
 		val prs = rc.executeQueryBuilder(prsQb).map(PersonRating.construct)
 
-		val maxFlags: List[StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat] = RatingLogic.maxFlags(boatTypes._1.toList, programs._1.toList, prs, ratings._1.toList)
-			.map(mbf => new StaffDockhouseScanCardGetResponseSuccessDto_MaxFlagsPerBoat(
+		val maxFlags: List[DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat] = RatingLogic.maxFlags(boatTypes._1.toList, programs._1.toList, prs, ratings._1.toList)
+			.map(mbf => new DtoStaffDockhouseScanCardGetResponseSuccess_MaxFlagsPerBoat(
 				boatId = mbf.boatId,
 				programId = mbf.programId,
 				maxFlag = mbf.maxFlag
 			))
 
-		Right(new StaffDockhouseScanCardGetResponseSuccessDto(
+		Right(new DtoStaffDockhouseScanCardGetResponseSuccess(
 			personId = pc.values.personId.get,
 			cardNumber = pc.values.cardNum.get,
 			nameFirst = person.values.nameFirst.get,
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassInstances.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassInstances.scala
index c5fff7cf..493b1229 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassInstances.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassInstances.scala
@@ -1,7 +1,7 @@
 package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest
 
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ApClassInstances.ThisSeason.{StaffRestApClassInstancesThisSeasonGetResponseSuccessDto, StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions, StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor}
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ApClassInstances.ThisSeason.{DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess, DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions, DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor}
 import org.sailcbi.APIServer.Entities.EntityDefinitions._
 import org.sailcbi.APIServer.Entities.cacheable.ApClassInstancesThisSeason
 import org.sailcbi.APIServer.UserTypes.StaffRequestCache
@@ -18,8 +18,8 @@ class ApClassInstances @Inject()(implicit val exec: ExecutionContext) extends In
 		})
 	})
 
-	def toDto(instances: List[ApClassInstance]): List[StaffRestApClassInstancesThisSeasonGetResponseSuccessDto] = {
-		instances.map(i => new StaffRestApClassInstancesThisSeasonGetResponseSuccessDto(
+	def toDto(instances: List[ApClassInstance]): List[DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess] = {
+		instances.map(i => new DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess(
 			instanceId = i.values.instanceId.get,
 			cancelledDatetime = i.values.cancelledDatetime.get.map(_.toString),
 			signupsStartOverride = i.values.signupsStartOverride.get.map(_.toString),
@@ -32,12 +32,12 @@ class ApClassInstances @Inject()(implicit val exec: ExecutionContext) extends In
 			locationString = i.values.locationString.get,
 			doNotAutoCancel = i.values.doNotAutoCancel.get,
 			instructorId = i.values.instructorId.get,
-			$$instructor = i.references.instructor.peek.flatMap(_.map(ii => new StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_Instructor(
+			$$instructor = i.references.instructor.peek.flatMap(_.map(ii => new DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_Instructor(
 				personId = ii.values.personId.get,
 				nameFirst = ii.values.nameFirst.get,
 				nameLast = ii.values.nameLast.get
 			))),
-			$$apClassSessions = i.references.apClassSessions.peek.map(ss => ss.map(s => new StaffRestApClassInstancesThisSeasonGetResponseSuccessDto_ApClassSessions(
+			$$apClassSessions = i.references.apClassSessions.peek.map(ss => ss.map(s => new DtoStaffRestApClassInstancesThisSeasonGetResponseSuccess_ApClassSessions(
 				sessionId = s.values.sessionId.get,
 				instanceId = s.values.instanceId.get,
 				headcount = s.values.headcount.get,
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassSessions.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassSessions.scala
index c034711f..f445f794 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassSessions.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassSessions.scala
@@ -107,8 +107,8 @@ class ApClassSessions @Inject()(implicit val exec: ExecutionContext) extends Inj
 		sessions
 	}
 
-	private def mapToDto(result: List[ApClassSession]): List[StaffRestApClassSessionsTodayGetResponseSuccessDto] = {
-		result.map(session => new StaffRestApClassSessionsTodayGetResponseSuccessDto(
+	private def mapToDto(result: List[ApClassSession]): List[DtoStaffRestApClassSessionsTodayGetResponseSuccess] = {
+		result.map(session => new DtoStaffRestApClassSessionsTodayGetResponseSuccess(
 			sessionId = session.values.sessionId.get,
 			instanceId = session.values.instanceId.get,
 			headcount = session.values.headcount.get,
@@ -118,7 +118,7 @@ class ApClassSessions @Inject()(implicit val exec: ExecutionContext) extends Inj
 			isMakeup = session.values.isMakeup.get,
 			$$apClassInstance = {
 				val instance = session.references.apClassInstance.get
-				new StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance(
+				new DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance(
 					instanceId = instance.values.instanceId.get,
 					cancelledDatetime = instance.values.cancelledDatetime.get.map(_.toString),
 					signupsStartOverride = instance.values.signupsStartOverride.get.map(_.toString),
@@ -131,7 +131,7 @@ class ApClassSessions @Inject()(implicit val exec: ExecutionContext) extends Inj
 					locationString = instance.values.locationString.get,
 					doNotAutoCancel = instance.values.doNotAutoCancel.get,
 					$$apClassSignups = instance.references.apClassSignups.get.map(s =>
-						new StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups(
+						new DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups(
 							instanceId = s.values.instanceId.get,
 							discountInstanceId = s.values.discountInstanceId.get,
 							voidedOnline = s.values.voidedOnline.get,
@@ -150,7 +150,7 @@ class ApClassSessions @Inject()(implicit val exec: ExecutionContext) extends Inj
 							signupDatetime = s.values.signupDatetime.get.toString,
 							$$person = {
 								val person = s.references.person.get
-								new StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_Person(
+								new DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_Person(
 									personId = person.values.personId.get,
 									nameFirst = person.values.nameFirst.get,
 									nameLast = person.values.nameLast.get
@@ -158,7 +158,7 @@ class ApClassSessions @Inject()(implicit val exec: ExecutionContext) extends Inj
 							},
 							$$apClassWaitlistResult = {
 								s.references.apClassWaitlistResult.get.map(wlr =>
-									new StaffRestApClassSessionsTodayGetResponseSuccessDto_ApClassInstance_ApClassSignups_ApClassWaitlistResult(
+									new DtoStaffRestApClassSessionsTodayGetResponseSuccess_ApClassInstance_ApClassSignups_ApClassWaitlistResult(
 										wlResult = wlr.values.wlResult.get,
 										foVmDatetime = wlr.values.foVmDatetime.get.map(_.toString),
 										offerExpDatetime = wlr.values.offerExpDatetime.get.toString,
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassTypes.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassTypes.scala
index aba4a017..0c86893d 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassTypes.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ApClassTypes.scala
@@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest
 
 import com.coleji.neptune.API.RestController
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ApClassTypes.{StaffRestApClassTypesGetResponseSuccessDto, StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats}
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ApClassTypes.{DtoStaffRestApClassTypesGetResponseSuccess, DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats}
 import org.sailcbi.APIServer.Entities.EntityDefinitions.BoatType
 import org.sailcbi.APIServer.Entities.cacheable.ApClassTypes
 import org.sailcbi.APIServer.UserTypes.StaffRequestCache
@@ -16,8 +16,8 @@ class ApClassTypes @Inject()(implicit val exec: ExecutionContext) extends RestCo
 	def getAll()(implicit PA: PermissionsAuthority): Action[AnyContent] = Action.async(req => {
 		PA.withRequestCache(StaffRequestCache)(None, ParsedRequest(req), rc => {
 			val types = ApClassTypes.get(rc, null)._1
-			implicit val writes: OFormat[StaffRestApClassTypesGetResponseSuccessDto] = StaffRestApClassTypesGetResponseSuccessDto.format
-			val ret = types.map(t => new StaffRestApClassTypesGetResponseSuccessDto(
+			implicit val writes: OFormat[DtoStaffRestApClassTypesGetResponseSuccess] = DtoStaffRestApClassTypesGetResponseSuccess.format
+			val ret = types.map(t => new DtoStaffRestApClassTypesGetResponseSuccess(
 				typeId = t.values.typeId.get,
 				typeName = t.values.typeName.get,
 				ratingPrereq = t.values.ratingPrereq.get,
@@ -32,7 +32,7 @@ class ApClassTypes @Inject()(implicit val exec: ExecutionContext) extends RestCo
 				signupMaxDefault = t.values.signupMaxDefault.get,
 				signupMinDefault = t.values.signupMinDefault.get,
 				disallowIfOverkill = t.values.disallowIfOverkill.get,
-				$$apClassFormats = t.references.apClassFormats.peek.map(fs => fs.map(f => new StaffRestApClassTypesGetResponseSuccessDto_ApClassFormats(
+				$$apClassFormats = t.references.apClassFormats.peek.map(fs => fs.map(f => new DtoStaffRestApClassTypesGetResponseSuccess_ApClassFormats(
 					formatId = f.values.formatId.get,
 					typeId = f.values.typeId.get,
 					description = f.values.description.get,
diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/GetClassInstructor.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/GetClassInstructor.scala
index e35774ff..a3166542 100644
--- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/GetClassInstructor.scala
+++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/GetClassInstructor.scala
@@ -2,6 +2,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest.ClassInstructor
 
 import com.coleji.neptune.API.RestController
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Rest.ClassInstructor.DtoStaffRestClassInstructorGetResponseSuccess
 import org.sailcbi.APIServer.Entities.EntityDefinitions.ClassInstructor
 import org.sailcbi.APIServer.UserTypes.StaffRequestCache
 import play.api.libs.json.Json
@@ -18,7 +19,12 @@ class GetClassInstructor @Inject()(implicit val exec: ExecutionContext) extends
 				ClassInstructor.fields.nameFirst,
 				ClassInstructor.fields.nameLast,
 			))
-			Future(Ok(Json.toJson(instructors)))
+			val ret = instructors.map(i => new DtoStaffRestClassInstructorGetResponseSuccess(
+				instructorId = i.values.instructorId.get,
+				nameFirst = i.values.nameFirst.get,
+				nameLast = i.values.nameLast.get
+			))
+			Future(Ok(Json.toJson(ret)))
 		})
 	})
 }
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala
index 8a7e6a92..de1cb06f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AccessProfile extends StorableClass(AccessProfile) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRelationship.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRelationship.scala
index 3bb06152..868e5ee2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRelationship.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRelationship.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AccessProfileRelationship extends StorableClass(AccessProfileRelationship) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRole.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRole.scala
index 3455f819..57aba3be 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRole.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfileRole.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AccessProfileRole extends StorableClass(AccessProfileRole) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassAttendance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassAttendance.scala
index 705d6917..d4040a27 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassAttendance.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassAttendance.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassAttendance extends StorableClass(ApClassAttendance) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala
index d61461cf..aa6bb5e0 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassFormat extends StorableClass(ApClassFormat) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassInstance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassInstance.scala
index f255fa5d..3262e20d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassInstance.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassInstance.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassInstance extends StorableClass(ApClassInstance) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSession.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSession.scala
index 0ece34ef..4446377f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSession.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSession.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassSession extends StorableClass(ApClassSession) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala
index e5b190a9..c3ec9813 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassSignup extends StorableClass(ApClassSignup) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
index 29da0cf5..6307e273 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassType extends StorableClass(ApClassType) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala
index ce27badd..00f92e1e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassTypeOverride extends StorableClass(ApClassTypeOverride) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala
index 797e1944..c355f113 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassTypesSeason extends StorableClass(ApClassTypesSeason) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala
index f2933443..9bac7b42 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassVoucher extends StorableClass(ApClassVoucher) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
index 5f73e30e..e7042fd1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassWaitlistResult.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ApClassWaitlistResult extends StorableClass(ApClassWaitlistResult) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala
index d78b6bbd..743e3c75 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AppIdIndex extends StorableClass(AppIdIndex) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala
index de825b88..5c9291e8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AppPrivilege extends StorableClass(AppPrivilege) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilegeGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilegeGroup.scala
index e8248aff..ba3d5820 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilegeGroup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilegeGroup.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class AppPrivilegeGroup extends StorableClass(AppPrivilegeGroup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala
index 2d24be1f..474098a1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class BoatRating extends StorableClass(BoatRating) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala
index ac5b12d2..fa223e42 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class BoatType extends StorableClass(BoatType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala
index bd7cd1f5..70ccfb7b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class BudgetItem extends StorableClass(BudgetItem) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinition.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinition.scala
index dc599b3b..d8ffdc05 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinition.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinition.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CardDefinition extends StorableClass(CardDefinition) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala
index f414ccad..6cd45ce4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CardDefinitionType extends StorableClass(CardDefinitionType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala
index 8e235a25..67711c5a 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CardDismissal extends StorableClass(CardDismissal) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala
index 332b5f0f..fa2eef87 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CcErrorCode extends StorableClass(CcErrorCode) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala
index b9317a70..5bbe4b3d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CcLog extends StorableClass(CcLog) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassInstructor.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassInstructor.scala
index 44118fe6..5771467d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassInstructor.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassInstructor.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ClassInstructor extends StorableClass(ClassInstructor) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala
index 6ba004e3..2185c5a2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ClassLocation extends StorableClass(ClassLocation) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsColumn.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsColumn.scala
index 50e32719..622cc2c1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsColumn.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsColumn.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CommentsColumn extends StorableClass(CommentsColumn) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala
index c864d7f2..02c0fc48 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CommentsTable extends StorableClass(CommentsTable) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ConstCont20140623.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ConstCont20140623.scala
index 7f13fcaa..927d6880 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ConstCont20140623.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ConstCont20140623.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ConstCont20140623 extends StorableClass(ConstCont20140623) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CorpAttend2013.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CorpAttend2013.scala
index c7132f69..47adf3c2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CorpAttend2013.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CorpAttend2013.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class CorpAttend2013 extends StorableClass(CorpAttend2013) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala
index 5b63923d..d3dcfe17 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Countrie extends StorableClass(Countrie) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala
index ec9f4984..0211e7f4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DamageWaiver extends StorableClass(DamageWaiver) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DatetimeRange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DatetimeRange.scala
index 4af7fb87..1ac5b969 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DatetimeRange.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DatetimeRange.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DatetimeRange extends StorableClass(DatetimeRange) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DeveloperSession.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DeveloperSession.scala
index 6e559a59..48276a55 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DeveloperSession.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DeveloperSession.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DeveloperSession extends StorableClass(DeveloperSession) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala
index 44c24292..73484cf8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DhGlobal extends StorableClass(DhGlobal) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala
index 1a4ed49f..171d3edd 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Discount extends StorableClass(Discount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCategorie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCategorie.scala
index 850128dc..502534fe 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCategorie.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCategorie.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DiscountCategorie extends StorableClass(DiscountCategorie) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala
index 7c126992..463d8b2c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DiscountCode extends StorableClass(DiscountCode) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstance.scala
index 1f32ead8..9de564ad 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstance.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstance.scala
@@ -4,6 +4,9 @@ import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DiscountInstance extends StorableClass(DiscountInstance) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstanceLevel.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstanceLevel.scala
index cda28ead..faa0e708 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstanceLevel.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountInstanceLevel.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DiscountInstanceLevel extends StorableClass(DiscountInstanceLevel) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountMapping.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountMapping.scala
index 90f1e555..afa9d217 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountMapping.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountMapping.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DiscountMapping extends StorableClass(DiscountMapping) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala
index a258d624..4f18fdf3 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReport extends StorableClass(DockReport) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportApClass.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportApClass.scala
index 698b5c0f..5fcb5d3d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportApClass.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportApClass.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReportApClass extends StorableClass(DockReportApClass) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportHullCount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportHullCount.scala
index e49cba68..b9f68419 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportHullCount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportHullCount.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReportHullCount extends StorableClass(DockReportHullCount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportStaff.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportStaff.scala
index 2ad47308..84d62601 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportStaff.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportStaff.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReportStaff extends StorableClass(DockReportStaff) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportUapAppt.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportUapAppt.scala
index d5cd4188..00b1fe8c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportUapAppt.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportUapAppt.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReportUapAppt extends StorableClass(DockReportUapAppt) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportWeather.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportWeather.scala
index 937279ce..cd117f8f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportWeather.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReportWeather.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DockReportWeather extends StorableClass(DockReportWeather) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala
index e988c1d9..e5344bf2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Donation extends StorableClass(Donation) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala
index d834d142..1159551a 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DonationFund extends StorableClass(DonationFund) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationInitiative.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationInitiative.scala
index c70802d6..548d782b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationInitiative.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationInitiative.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DonationInitiative extends StorableClass(DonationInitiative) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationSuggestion.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationSuggestion.scala
index 1e2a8304..e53ddf9d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationSuggestion.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationSuggestion.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DonationSuggestion extends StorableClass(DonationSuggestion) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DuplActionPreventionRecord.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DuplActionPreventionRecord.scala
index 229d828f..377cfaa6 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DuplActionPreventionRecord.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DuplActionPreventionRecord.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class DuplActionPreventionRecord extends StorableClass(DuplActionPreventionRecord) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala
index 2492586a..3127afd2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EiiMit extends StorableClass(EiiMit) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala
index 087a2bea..0a1b29e4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EiiOverride extends StorableClass(EiiOverride) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala
index d5e0bf31..7f70904e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EiiResponse extends StorableClass(EiiResponse) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala
index 40cc5906..870f7ebf 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EmailContent extends StorableClass(EmailContent) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContentGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContentGroup.scala
index 545d769b..35c5dd86 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContentGroup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContentGroup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EmailContentGroup extends StorableClass(EmailContentGroup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala
index 88e720bb..003541cf 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class EmailTracking extends StorableClass(EmailTracking) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala
index ec1661a8..c4899a73 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ErrorType extends StorableClass(ErrorType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala
index 16724ace..ac4aa58a 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Event extends StorableClass(Event) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala
index eea8cb43..dc50b323 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Feedback extends StorableClass(Feedback) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala
index 5b53c630..cb29d936 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FlagChange extends StorableClass(FlagChange) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala
index 2863a5db..aa5d282c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FlagsGlobal extends StorableClass(FlagsGlobal) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala
index d2cd97c8..68e775cb 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoAppliedGc extends StorableClass(FoAppliedGc) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala
index a2c3615f..afc95b76 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoAr extends StorableClass(FoAr) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala
index 2611f3f6..38677c92 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoArSource extends StorableClass(FoArSource) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala
index 512f56e3..69e038bc 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCash extends StorableClass(FoCash) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashDenomination.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashDenomination.scala
index 87431531..5c19a701 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashDenomination.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashDenomination.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCashDenomination extends StorableClass(FoCashDenomination) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashLocation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashLocation.scala
index 756cae66..52ab9f1b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashLocation.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCashLocation.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCashLocation extends StorableClass(FoCashLocation) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala
index 4d559c01..919ca74d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCheck extends StorableClass(FoCheck) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala
index ce181faf..8422005e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoClose extends StorableClass(FoClose) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala
index 201306cd..dbd0606b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCloseUser extends StorableClass(FoCloseUser) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCurrentClose.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCurrentClose.scala
index 36c76eb9..9db9b8a4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCurrentClose.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCurrentClose.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoCurrentClose extends StorableClass(FoCurrentClose) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala
index a7b68fe1..51f65946 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoItem extends StorableClass(FoItem) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemCategorie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemCategorie.scala
index d50c2a51..106606b3 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemCategorie.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemCategorie.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoItemCategorie extends StorableClass(FoItemCategorie) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala
index e8632b2d..26a06afd 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoItemType extends StorableClass(FoItemType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemTypesLookup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemTypesLookup.scala
index a1c293bc..418c6664 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemTypesLookup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemTypesLookup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoItemTypesLookup extends StorableClass(FoItemTypesLookup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemsLookup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemsLookup.scala
index 3d69b283..84c4fdaa 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemsLookup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemsLookup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoItemsLookup extends StorableClass(FoItemsLookup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala
index cd351162..a067e5ac 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoMisc extends StorableClass(FoMisc) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala
index a69da165..bae7f12f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoMiscLookup extends StorableClass(FoMiscLookup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala
index 7ca24adf..f1028fcb 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class FoParking extends StorableClass(FoParking) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertPurchase.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertPurchase.scala
index ee0e530f..252fe216 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertPurchase.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertPurchase.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GiftCertPurchase extends StorableClass(GiftCertPurchase) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertState.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertState.scala
index 2864eb99..ba0fdb92 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertState.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertState.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GiftCertState extends StorableClass(GiftCertState) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertificate.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertificate.scala
index fc61a0f8..b55e6c28 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertificate.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertificate.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GiftCertificate extends StorableClass(GiftCertificate) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertsDiscount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertsDiscount.scala
index 3259e58a..10dac296 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertsDiscount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GiftCertsDiscount.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GiftCertsDiscount extends StorableClass(GiftCertsDiscount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala
index 8ac151d3..b76ed217 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GlobalConstant extends StorableClass(GlobalConstant) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantDataType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantDataType.scala
index ccad0f05..f3660d97 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantDataType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantDataType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GlobalConstantDataType extends StorableClass(GlobalConstantDataType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantsValue.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantsValue.scala
index b2ed67f6..76477868 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantsValue.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstantsValue.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GlobalConstantsValue extends StorableClass(GlobalConstantsValue) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala
index 2a355a0b..893aedf5 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class GuestPriv extends StorableClass(GuestPriv) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala
index 3292a41d..8295c989 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class HighSchool extends StorableClass(HighSchool) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala
index 5cc80719..4484e577 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class HighSchoolFee extends StorableClass(HighSchoolFee) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala
index 569af3de..889313f1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class HighSchoolPayment extends StorableClass(HighSchoolPayment) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala
index 0b3f8c48..07921d16 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class InstallmentSale extends StorableClass(InstallmentSale) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala
index 46a97e79..cf01e81f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class InstructionQueue extends StorableClass(InstructionQueue) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassAttendance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassAttendance.scala
index 59a54cc5..d24e71a9 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassAttendance.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassAttendance.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassAttendance extends StorableClass(JpClassAttendance) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala
index e2213b0c..aa4facee 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassInstance extends StorableClass(JpClassInstance) {
 
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSection.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSection.scala
index ff8b9f54..dd9083af 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSection.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSection.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSection extends StorableClass(JpClassSection) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSectionLookup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSectionLookup.scala
index baabeda0..a38b524a 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSectionLookup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSectionLookup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSectionLookup extends StorableClass(JpClassSectionLookup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSession.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSession.scala
index 1608c1cf..1ea5cf77 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSession.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSession.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSession extends StorableClass(JpClassSession) {
 
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignup.scala
index 62c1f452..5d4b2329 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignup.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSignup extends StorableClass(JpClassSignup) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignupsSkill.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignupsSkill.scala
index 7174bd34..fd929c64 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignupsSkill.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSignupsSkill.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSignupsSkill extends StorableClass(JpClassSignupsSkill) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala
index 12400ad0..34355b3c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSkill extends StorableClass(JpClassSkill) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkillsRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkillsRating.scala
index 49e5f646..c3271af7 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkillsRating.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkillsRating.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassSkillsRating extends StorableClass(JpClassSkillsRating) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala
index 4157c117..1db6495f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassStagger extends StorableClass(JpClassStagger) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala
index 6662024f..fae72a5b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassType extends StorableClass(JpClassType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala
index 32be6d91..31292ce8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassTypeOverride extends StorableClass(JpClassTypeOverride) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassWlResult.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassWlResult.scala
index c093e050..5f25b748 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassWlResult.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassWlResult.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClassWlResult extends StorableClass(JpClassWlResult) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala
index 0cadf7cc..a83e20b9 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpClosure extends StorableClass(JpClosure) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpEmailTracking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpEmailTracking.scala
index 4f8eafc7..6f2b1b86 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpEmailTracking.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpEmailTracking.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpEmailTracking extends StorableClass(JpEmailTracking) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala
index 264c4ec2..5b224066 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpGroup extends StorableClass(JpGroup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala
index 930f32c5..d3963a39 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpNoSwim extends StorableClass(JpNoSwim) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpReplMapping.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpReplMapping.scala
index f1f03346..800398c2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpReplMapping.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpReplMapping.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpReplMapping extends StorableClass(JpReplMapping) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpecialNeed.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpecialNeed.scala
index 0fcff716..8dd13478 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpecialNeed.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpecialNeed.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpSpecialNeed extends StorableClass(JpSpecialNeed) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpringWaitlist.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpringWaitlist.scala
index 38433560..e6083dc8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpringWaitlist.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpSpringWaitlist.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpSpringWaitlist extends StorableClass(JpSpringWaitlist) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala
index 2f9b0bc2..2518ce5e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpTeam extends StorableClass(JpTeam) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala
index 6e47ebfa..9a70aae4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpTeamEvent extends StorableClass(JpTeamEvent) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEventPoints.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEventPoints.scala
index 033cb6de..729ebe9b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEventPoints.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEventPoints.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpTeamEventPoints extends StorableClass(JpTeamEventPoints) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala
index dae2e792..5fa4b0a8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpWeather extends StorableClass(JpWeather) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpcInstancesDiscount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpcInstancesDiscount.scala
index 598cd0d5..07065e5f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpcInstancesDiscount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpcInstancesDiscount.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class JpcInstancesDiscount extends StorableClass(JpcInstancesDiscount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala
index 16fb3670..c2a02b46 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Language extends StorableClass(Language) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesAllowedRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesAllowedRating.scala
index 1e761d58..4c974069 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesAllowedRating.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesAllowedRating.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MemTypesAllowedRating extends StorableClass(MemTypesAllowedRating) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesApClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesApClassType.scala
index 60ba1f70..31125731 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesApClassType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MemTypesApClassType.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MemTypesApClassType extends StorableClass(MemTypesApClassType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipPrice.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipPrice.scala
index f12a21c3..4b41bcee 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipPrice.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipPrice.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MembershipPrice extends StorableClass(MembershipPrice) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala
index 7e8e4cfd..ecd7e784 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MembershipType extends StorableClass(MembershipType) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeDiscount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeDiscount.scala
index b60e2ec3..5f67a4db 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeDiscount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeDiscount.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MembershipTypeDiscount extends StorableClass(MembershipTypeDiscount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeExp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeExp.scala
index 8476a83b..b962a4cc 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeExp.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipTypeExp.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MembershipTypeExp extends StorableClass(MembershipTypeExp) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipsDiscount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipsDiscount.scala
index 1a013e55..cfa57086 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipsDiscount.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipsDiscount.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MembershipsDiscount extends StorableClass(MembershipsDiscount) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala
index 47ae306f..06d5ee17 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class MergeHistory extends StorableClass(MergeHistory) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala
index bd91d87d..9e9efd0d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OptOutGroup extends StorableClass(OptOutGroup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutRequest.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutRequest.scala
index 29ad16ed..10b7fa00 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutRequest.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutRequest.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OptOutRequest extends StorableClass(OptOutRequest) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala
index c80866f0..0555932c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OrderNumber extends StorableClass(OrderNumber) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala
index b9e7384b..de5c0548 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OrderStaggeredPayment extends StorableClass(OrderStaggeredPayment) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala
index 844a3fc4..c688468f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OrdersPromo extends StorableClass(OrdersPromo) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala
index 05c16dee..bfe8d926 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class OrdersStripePaymentIntent extends StorableClass(OrdersStripePaymentIntent) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala
index 2dbf9b42..07602cc2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Pa extends StorableClass(Pa) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PerformanceLog.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PerformanceLog.scala
index f99757fd..169f8ac5 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PerformanceLog.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PerformanceLog.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PerformanceLog extends StorableClass(PerformanceLog) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala
index b27ca8bf..cd68d67d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonCard extends StorableClass(PersonCard) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonMembership.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonMembership.scala
index 17951078..7aaeed5e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonMembership.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonMembership.scala
@@ -5,6 +5,7 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
 import play.api.libs.json._
 
 class PersonMembership extends StorableClass(PersonMembership) {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala
index 3b7d2c3d..accd8430 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala
@@ -4,6 +4,9 @@ import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonRating extends StorableClass(PersonRating) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationship.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationship.scala
index a53875ec..947f7c26 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationship.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationship.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonRelationship extends StorableClass(PersonRelationship) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationshipType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationshipType.scala
index fc0d0b9d..cc971aa8 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationshipType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRelationshipType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonRelationshipType extends StorableClass(PersonRelationshipType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala
index eacdf139..3495d5d0 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonTag extends StorableClass(PersonTag) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala
index 2192f81a..cf70865f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonType extends StorableClass(PersonType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTypesField.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTypesField.scala
index 54f4c07a..2b3c363b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTypesField.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTypesField.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonTypesField extends StorableClass(PersonTypesField) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsCardsAlternate.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsCardsAlternate.scala
index 4e1f901c..b4d63b76 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsCardsAlternate.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsCardsAlternate.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsCardsAlternate extends StorableClass(PersonsCardsAlternate) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala
index 3f400bc8..bd17055f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsDiscountsEligible extends StorableClass(PersonsDiscountsEligible) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala
index cda30543..defb4235 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsEvent extends StorableClass(PersonsEvent) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsNotificationPreference.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsNotificationPreference.scala
index d464956c..ed07b770 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsNotificationPreference.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsNotificationPreference.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsNotificationPreference extends StorableClass(PersonsNotificationPreference) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala
index 9e30da4f..9ee5e94e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsRecurringDonation extends StorableClass(PersonsRecurringDonation) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala
index e0230e22..79a08cdb 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsTemp extends StorableClass(PersonsTemp) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala
index 053e232c..1f7589bd 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class PersonsToDelete extends StorableClass(PersonsToDelete) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala
index 3eab8e99..3c28ad6f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Preference extends StorableClass(Preference) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala
index 38ca2688..c0dda0a0 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ProgramType extends StorableClass(ProgramType) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala
index 6dc3ba65..d96e029d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Promotion extends StorableClass(Promotion) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala
index a4883d0e..8b88d9d3 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class RaCz extends StorableClass(RaCz) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala
index 59947fbf..20e4a08f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Rating extends StorableClass(Rating) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala
index b400ac16..a857a045 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class RatingChange extends StorableClass(RatingChange) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingProgram.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingProgram.scala
index ee61aa7b..21126db2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingProgram.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingProgram.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class RatingProgram extends StorableClass(RatingProgram) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala
index 2b84aa03..98803de2 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ResetPwReq extends StorableClass(ResetPwReq) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala
index 9c9b5feb..dfe61e8b 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Restriction extends StorableClass(Restriction) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ScheduledDowntime.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ScheduledDowntime.scala
index 6c9db11b..e52614ef 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ScheduledDowntime.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ScheduledDowntime.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ScheduledDowntime extends StorableClass(ScheduledDowntime) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SendgridSuppressionActivity.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SendgridSuppressionActivity.scala
index ca653cfc..f56967eb 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SendgridSuppressionActivity.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SendgridSuppressionActivity.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SendgridSuppressionActivity extends StorableClass(SendgridSuppressionActivity) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionBlacklist.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionBlacklist.scala
index 3529e134..0eb5ed55 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionBlacklist.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionBlacklist.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SessionBlacklist extends StorableClass(SessionBlacklist) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala
index 1e3110aa..4d166a4d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SessionKey extends StorableClass(SessionKey) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartApplGc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartApplGc.scala
index 587c9f90..db45095d 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartApplGc.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartApplGc.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartApplGc extends StorableClass(ShoppingCartApplGc) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartDonation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartDonation.scala
index b94525e1..69ac87aa 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartDonation.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartDonation.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartDonation extends StorableClass(ShoppingCartDonation) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGc.scala
index 4182767b..d370cdf4 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGc.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGc.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartGc extends StorableClass(ShoppingCartGc) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGuestPriv.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGuestPriv.scala
index 58206396..00133336 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGuestPriv.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartGuestPriv.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartGuestPriv extends StorableClass(ShoppingCartGuestPriv) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartJpc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartJpc.scala
index 9a8f613f..edeadf3f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartJpc.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartJpc.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartJpc extends StorableClass(ShoppingCartJpc) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartMembership.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartMembership.scala
index df997fa9..159fc6b3 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartMembership.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartMembership.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartMembership extends StorableClass(ShoppingCartMembership) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartWaiver.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartWaiver.scala
index 9b353f34..591218f0 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartWaiver.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ShoppingCartWaiver.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class ShoppingCartWaiver extends StorableClass(ShoppingCartWaiver) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala
index 417937f9..fb0dd5cf 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Signout extends StorableClass(Signout) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala
index 94770eac..934ee7a6 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SignoutCrew extends StorableClass(SignoutCrew) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala
index 3aef20d4..8bfff84c 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SignoutTest extends StorableClass(SignoutTest) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutsDebug.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutsDebug.scala
index cb224503..0736768f 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutsDebug.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutsDebug.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SignoutsDebug extends StorableClass(SignoutsDebug) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala
index a4a561f8..2d401499 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SpecialNeed extends StorableClass(SpecialNeed) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala
index c36f14ba..be5f19d1 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class State extends StorableClass(State) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeChargeAttLog.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeChargeAttLog.scala
index de8eb8fe..b9e53e3e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeChargeAttLog.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeChargeAttLog.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class StripeChargeAttLog extends StorableClass(StripeChargeAttLog) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala
index 36f1deba..55d4bae9 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class StripeToken extends StorableClass(StripeToken) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala
index 1e65e5bd..37ab5bbe 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Sunset extends StorableClass(Sunset) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala
index 19e31210..89be71c9 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SunsetTime extends StorableClass(SunsetTime) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SwimProofMethod.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SwimProofMethod.scala
index a0fd2bd6..098ab4c0 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SwimProofMethod.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SwimProofMethod.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SwimProofMethod extends StorableClass(SwimProofMethod) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala
index 11f170a4..879d0cce 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class SymonSchedule extends StorableClass(SymonSchedule) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala
index 3c8c3b64..abc7de55 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class TableInfo extends StorableClass(TableInfo) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala
index 39c6be14..8598e610 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class Tag extends StorableClass(Tag) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TempMakeIndice.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TempMakeIndice.scala
index 87c8b2fb..549b9703 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TempMakeIndice.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TempMakeIndice.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class TempMakeIndice extends StorableClass(TempMakeIndice) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala
index 0dee0126..313b6934 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class TextFile extends StorableClass(TextFile) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala
index f929919c..fcefcdab 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UapComment extends StorableClass(UapComment) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala
index fcd1d562..f265b875 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UapGroup extends StorableClass(UapGroup) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroupPrice.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroupPrice.scala
index 45f99994..017db097 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroupPrice.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroupPrice.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UapGroupPrice extends StorableClass(UapGroupPrice) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala
index 9dc8df59..4a8a350a 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala
@@ -5,6 +5,8 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class User extends StorableClass(User) {
 	override object references extends ReferencesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala
index b8f5575a..a1be1f1e 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UserRole extends StorableClass(UserRole) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala
index 09d9d5f4..4d35fa22 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UsersIp extends StorableClass(UsersIp) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersPreference.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersPreference.scala
index 18cba891..25321865 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersPreference.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersPreference.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class UsersPreference extends StorableClass(UsersPreference) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/VerifyEmailReq.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/VerifyEmailReq.scala
index 981bfe87..78e33bac 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/VerifyEmailReq.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/VerifyEmailReq.scala
@@ -3,6 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
+import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class VerifyEmailReq extends StorableClass(VerifyEmailReq) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala
index 15e6438a..fdefeae9 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class WikiEntrie extends StorableClass(WikiEntrie) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala
index 2323122d..352a48d7 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class YearlyDate extends StorableClass(YearlyDate) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDateItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDateItem.scala
index b530b5c7..f21c6736 100644
--- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDateItem.scala
+++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDateItem.scala
@@ -3,7 +3,10 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
+import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
+import org.sailcbi.APIServer.Entities.entitycalculations._
+import play.api.libs.json._
 
 class YearlyDateItem extends StorableClass(YearlyDateItem) {
 	override object values extends ValuesObject {
diff --git a/app/org/sailcbi/APIServer/IO/Portal/PortalLogic.scala b/app/org/sailcbi/APIServer/IO/Portal/PortalLogic.scala
index 3be7a7ac..0ad5b235 100644
--- a/app/org/sailcbi/APIServer/IO/Portal/PortalLogic.scala
+++ b/app/org/sailcbi/APIServer/IO/Portal/PortalLogic.scala
@@ -6,7 +6,7 @@ import com.coleji.neptune.IO.PreparedQueries._
 import com.coleji.neptune.Storable.{GetSQLLiteral, GetSQLLiteralPrepared, ResultSetWrapper}
 import com.coleji.neptune.Util._
 import com.coleji.neptune.{API, Storable}
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApClassInstancesInstructorInfo.MemberApClassInstancesInstructorInfoGetResponseSuccessDto
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Member.ApClassInstancesInstructorInfo.DtoMemberApClassInstancesInstructorInfoGetResponseSuccess
 import org.sailcbi.APIServer.BarcodeFactory
 import org.sailcbi.APIServer.Entities.JsFacades.Stripe.{PaymentIntent, PaymentMethod}
 import org.sailcbi.APIServer.Entities.MagicIds
@@ -2027,9 +2027,9 @@ object PortalLogic {
 		def apply(v: JsValue): ApClassAvailability = v.as[ApClassAvailability]
 	}
 
-	def getApClassesInstructorInfo(rc: RequestCache, personId: Int): List[MemberApClassInstancesInstructorInfoGetResponseSuccessDto] = {
-		val instancesQ: PreparedQueryForSelect[MemberApClassInstancesInstructorInfoGetResponseSuccessDto] = new PreparedQueryForSelect[MemberApClassInstancesInstructorInfoGetResponseSuccessDto](Set(MemberRequestCache)) {
-			override def mapResultSetRowToCaseObject(rsw: ResultSetWrapper): MemberApClassInstancesInstructorInfoGetResponseSuccessDto = new MemberApClassInstancesInstructorInfoGetResponseSuccessDto(
+	def getApClassesInstructorInfo(rc: RequestCache, personId: Int): List[DtoMemberApClassInstancesInstructorInfoGetResponseSuccess] = {
+		val instancesQ: PreparedQueryForSelect[DtoMemberApClassInstancesInstructorInfoGetResponseSuccess] = new PreparedQueryForSelect[DtoMemberApClassInstancesInstructorInfoGetResponseSuccess](Set(MemberRequestCache)) {
+			override def mapResultSetRowToCaseObject(rsw: ResultSetWrapper): DtoMemberApClassInstancesInstructorInfoGetResponseSuccess = new DtoMemberApClassInstancesInstructorInfoGetResponseSuccess(
 				instanceId = rsw.getInt(1),
 				instructorName = rsw.getOptionString(2),
 				signupCt = rsw.getInt(3),
diff --git a/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala b/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala
index 62530514..d3472263 100644
--- a/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala
+++ b/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala
@@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Logic.DockhouseLogic.CreateSignoutLogic
 
 import com.coleji.neptune.Core.UnlockedRequestCache
 import com.coleji.neptune.Util.BitVector
-import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignout.StaffDockhouseCreateSignoutPostRequestDto
+import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignout.{DtoStaffDockhouseCreateSignoutPostRequest}
 import org.sailcbi.APIServer.Entities.EntityDefinitions.{Signout, SignoutTest}
 import org.sailcbi.APIServer.Entities.MagicIds
 import org.sailcbi.APIServer.Logic.IO.DockhouseIo
@@ -42,7 +42,7 @@ object CreateSignoutLogic {
 		ERROR_CREW_INVALID,
 	)
 
-	def attemptSignout(rc: UnlockedRequestCache, req: StaffDockhouseCreateSignoutPostRequestDto): Either[CreateSignoutError, Signout] = {
+	def attemptSignout(rc: UnlockedRequestCache, req: DtoStaffDockhouseCreateSignoutPostRequest): Either[CreateSignoutError, Signout] = {
 		val errors = {
 			if (!req.isRacing) {
 				List.empty
@@ -60,7 +60,7 @@ object CreateSignoutLogic {
 		}
 	}
 
-	private def createSignout(rc: UnlockedRequestCache, req: StaffDockhouseCreateSignoutPostRequestDto): Signout = {
+	private def createSignout(rc: UnlockedRequestCache, req: DtoStaffDockhouseCreateSignoutPostRequest): Signout = {
 		// TODO
 		val signoutType = {
 			if (req.isRacing) MagicIds.SIGNOUT_TYPES.RACING
diff --git a/doc/static/io-ts-codec/staff/dockhouse/create-signout.ts b/doc/static/io-ts-codec/staff/dockhouse/create-signout.ts
deleted file mode 100644
index 2d10fd9f..00000000
--- a/doc/static/io-ts-codec/staff/dockhouse/create-signout.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-import { OptionalNumber, OptionalString } from 'util/OptionalTypeValidators';
-
-const createSignoutCrewValidator = t.type({
-	personId: t.number,
-	cardNumber: t.string,
-	testRatingId: OptionalNumber
-});
-
-const createSignoutValidator = t.type({
-	skipperPersonId: t.number,
-	skipperCardNumber: t.string,
-	skipperTestRatingId: OptionalNumber,
-	programId: t.number,
-	boatId: t.number,
-	sailNumber: OptionalString,
-	hullNumber: OptionalString,
-	classSessionId: OptionalNumber,
-	isRacing: t.boolean,
-	dockmasterOverride: t.boolean,
-	didInformKayakRules: t.boolean,
-	signoutCrew: t.array(createSignoutCrewValidator)
-})
-
-const path = "/staff/dockhouse/create-signout"
-
-export const postWrapper = new APIWrapper({
-	path: path,
-	type: HttpMethod.POST,
-	resultValidator: t.any,
-	postBodyValidator: createSignoutValidator
-})
\ No newline at end of file
diff --git a/doc/static/io-ts-codec/staff/dockhouse/dh-globals.ts b/doc/static/io-ts-codec/staff/dockhouse/dh-globals.ts
deleted file mode 100644
index 836d7ee9..00000000
--- a/doc/static/io-ts-codec/staff/dockhouse/dh-globals.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-
-const announcementValidator = t.type({
-	message: t.string,
-	priority: t.string
-})
-
-const flagChangeValidator = t.type({
-	flag: t.string,
-	changeDatetime: t.string,
-})
-
-export const dhGlobalsValidator = t.type({
-	serverDateTime: t.string,
-	sunsetTime: t.string,
-	windSpeedAvg: t.number,
-	winDir: t.string,
-	announcements: t.array(announcementValidator),
-	flagChanges: t.array(flagChangeValidator)
-})
-
-const path = "/staff/dockhouse/dh-globals"
-
-export const getWrapper = new APIWrapper({
-	path: path ,
-	type: HttpMethod.GET,
-	resultValidator: dhGlobalsValidator
-})
\ No newline at end of file
diff --git a/doc/static/io-ts-codec/staff/dockhouse/grant-ratings.ts b/doc/static/io-ts-codec/staff/dockhouse/grant-ratings.ts
deleted file mode 100644
index b617928b..00000000
--- a/doc/static/io-ts-codec/staff/dockhouse/grant-ratings.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-import { OptionalNumber, OptionalString } from 'util/OptionalTypeValidators';
-
-const grantRatingsValidator = t.type({
-	instructor: t.string,
-	programId: t.number,
-	personIds: t.array(t.number),
-	ratingIds: t.array(t.number),
-})
-
-const path = "/staff/dockhouse/grant-ratings"
-
-export const postWrapper = new APIWrapper({
-	path: path,
-	type: HttpMethod.POST,
-	resultValidator: t.any,
-	postBodyValidator: grantRatingsValidator
-})
\ No newline at end of file
diff --git a/doc/static/io-ts-codec/staff/dockhouse/put-flag-change.ts b/doc/static/io-ts-codec/staff/dockhouse/put-flag-change.ts
deleted file mode 100644
index 338ff54e..00000000
--- a/doc/static/io-ts-codec/staff/dockhouse/put-flag-change.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-
-const putFlagChangeValidator = t.type({
-	flagColor: t.string,
-})
-
-const path = "/staff/dockhouse/put-flag-change"
-
-export const postWrapper = new APIWrapper({
-	path: path,
-	type: HttpMethod.POST,
-	resultValidator: t.any,
-	postBodyValidator: putFlagChangeValidator
-})
\ No newline at end of file
diff --git a/doc/static/io-ts-codec/staff/dockhouse/scan-card.ts b/doc/static/io-ts-codec/staff/dockhouse/scan-card.ts
deleted file mode 100644
index cdd79be7..00000000
--- a/doc/static/io-ts-codec/staff/dockhouse/scan-card.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-import { OptionalDate, OptionalNumber, OptionalString } from 'util/OptionalTypeValidators';
-
-const scanCardMembershipValidator = t.type({
-	assignId: t.number,
-	membershipTypeId: t.number,
-	startDate: OptionalDate,
-	expirationDate: OptionalDate,
-	discountName: OptionalString,
-	isDiscountFrozen: t.boolean,
-	hasGuestPrivs: t.boolean,
-	programId: OptionalNumber,
-	bannerComment: OptionalString,
-    signoutBlockReason: OptionalString,
-})
-
-const scanCardRatingValidator = t.type({
-	ratingId: t.number,
-	programId: t.number,
-	ratingName: t.string,
-	status: t.string // Y | F
-})
-
-const scanCardClassSignupValidator = t.type({
-    signupId: t.number,
-    instanceId: t.number,
-    personId: t.number,
-    signupType: t.string,
-    signupDatetime: t.string,
-    sequence: t.number,
-})
-
-export const scanCardValidator = t.type({
-	personId: t.number,
-	cardNumber: t.string,
-	nameFirst: t.string,
-	nameLast: t.string,
-	bannerComment: OptionalString,
-	specialNeeds: OptionalString,
-	activeMemberships: t.array(scanCardMembershipValidator),
-	personRatings: t.array(scanCardRatingValidator),
-    maxFlagsPerBoat: t.array(t.type({
-		$$boatType: t.type({
-			boatId: t.number
-		}),
-		$$programType: t.type({
-			programId: t.number
-		}),
-		maxFlag: t.string // G | Y | R
-    }),
-	apClassSignupsToday: t.array(scanCardClassSignupValidator),
-	jpClassSignupsToday: t.array(scanCardClassSignupValidator),
-})
-
-export type ScannedPersonType = t.TypeOf<typeof scanCardValidator>;
-
-export type ScannedCrewType = ScannedPersonType[];
-
-const path = "/staff/dockhouse/scan-card"
-
-export const getWrapper = (cardNumber: string) => new APIWrapper({
-	path: path + "?cardNumber=" + cardNumber,
-	type: HttpMethod.GET,
-	resultValidator: scanCardValidator
-})
diff --git a/doc/static/io-ts-codec/staff/rest/ap-class-sessions.ts b/doc/static/io-ts-codec/staff/rest/ap-class-sessions.ts
deleted file mode 100644
index e500b305..00000000
--- a/doc/static/io-ts-codec/staff/rest/ap-class-sessions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as t from 'io-ts';
-import APIWrapper from 'core/APIWrapper';
-import { HttpMethod } from "core/HttpMethod";
-import { OptionalNumber, OptionalString } from 'util/OptionalTypeValidators';
-
-const apClassWaitListValidator = t.type({
-	"wlResult": "E",
-	"foVmDatetime": null,
-	"offerExpDatetime": null,
-	"signupId": 2104,
-	"foAlertDatetime": null
-})
-
-const apClassSignupValidator = t.type({
-    instanceId: t.number,
-    discountInstanceId: OptionalNumber,
-    voidedOnline: t.boolean,
-    $$apClassWaitlistResult: apClassWaitListValidator,
-    personId: t.number,
-    orderId: OptionalNumber,
-    price: OptionalNumber,
-    signupId:  t.number4,
-    $$person: t.type({
-        personId:  t.number,
-        nameFirst: OptionalString,
-        nameLast: OptionalString
-    }),
-    closeId: OptionalNumber,
-    sequence: t.number,
-    paymentMedium: OptionalString,
-    ccTransNum: OptionalString,
-    paymentLocation: OptionalString,
-    voidCloseId: OptionalNumber,
-    signupType: t.string,
-    signupNote: t.string,
-    signupDatetime: t.string
-})
-
-const apClassInstanceValidator = t.type({
-	"instanceId": t.number,
-	"cancelledDatetime": OptionalString,
-	"signupsStartOverride": OptionalString,
-	"signupMin": OptionalNumber,
-	"price": OptionalNumber,
-	"signupMax": OptionalNumber,
-	"formatId": t.number,
-	"hideOnline": t.boolean,
-	"cancelByOverride": OptionalString,
-	"locationString": OptionalString,
-	$$apClassSignups: t.array(apClassSignupValidator)
-})
-
-const apClassSessionValidator = t.type({
-	"instanceId": t.number,
-	"sessionId": t.number,
-	"cancelledDateTime": OptionalString,
-	"sessionDateTime": t.string,
-	"headcount": OptionalNumber,
-	"sessionLength": t.number,
-	"$$apClassInstance": apClassInstanceValidator
-})
-
-
-export type ApClassInstance = t.TypeOf<typeof apClassInstanceValidator>
-export type ApClassSession = t.TypeOf<typeof apClassSessionValidator>
-
-const path = "/rest/ap-class-sessions/today"
-
-export const postWrapper = new APIWrapper({
-	path: path,
-	type: HttpMethod.GET,
-	resultValidator: t.array(apClassSessionValidator),
-})
diff --git a/doc/static/swagger/api-staff.yaml b/doc/static/swagger/api-staff.yaml
deleted file mode 100644
index 26217183..00000000
--- a/doc/static/swagger/api-staff.yaml
+++ /dev/null
@@ -1,534 +0,0 @@
-openapi: 3.0.0
-info:
-  description: "Signout REST"
-  version: "1.0.0"
-  title: "Signout REST"
-  contact:
-    email: "jon@community-boating.org"
-paths:
-  /staff/dockhouse/grant-ratings:
-    get:
-      summary: "Grant ratings"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/GrantRatingsRequest"
-  /staff/dockhouse/dh-globals:
-    get:
-      summary: "Get DH global values"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/DockhouseGlobals"
-  /staff/dockhouse/put-flag-change:
-    get:
-      summary: "Get DH global values"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  flagColor:
-                    type: string
-                    enum: [G,Y,R,C]
-  /staff/dockhouse/scan-card:
-    get:
-      summary: "Scan a card to fetch person info"
-      parameters:
-        - in: query
-          name: cardNumber
-          schema:
-            type: integer
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CardScanResult"
-  /staff/dockhouse/create-signout:
-    post:
-      summary: "Attempt to create a signout"
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/CreateSignout"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Signout"
-  /rest/signouts-today:
-    get:
-      summary: "Get today's signouts"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Signout"
-  /rest/signout:
-    post:
-      summary: "Update a signout"
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Signout"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Signout"
-  /rest/ap-class-sessions/today:
-    get:
-      summary: "Get today's class sessions"
-      responses:
-        "200":
-          description: "Success"
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/ApClassSession"
-components:
-  schemas:
-    GrantRatingsRequest:
-      type: object
-      properties:
-        instructor:
-          type: string
-        programId:
-          type: number
-        personIds:
-          type: array
-          items:
-            type: number
-        ratingIds:
-          type: array
-          items:
-            type: number
-    FlagColorHistory:
-      type: object
-      properties:
-        flag:
-          type: string
-        changeDatetime:
-          type: string
-    DockhouseAnnouncement:
-      type: object
-      properties:
-        message:
-          type: string
-        priority:
-          type: string
-    DockhouseGlobals:
-      type: object
-      properties:
-        serverDateTime:
-          type: string
-        sunsetTime:
-          type: string
-        windSpeedAvg:
-          type: number
-        winDir:
-          type: string
-        announcements:
-          type: array
-          items:
-            $ref: "#/components/schemas/DockhouseAnnouncement"
-        flagChanges:
-          type: array
-          items:
-            $ref: "#/components/schemas/CardScanResultRating"
-    CardScanResultMembership:
-      type: object
-      properties:
-        assignId:
-          type: number
-        membershipTypeId:
-          type: number
-        startDate:
-          nullable: true
-          type: string
-        expirationDate:
-          nullable: true
-          type: string
-        discountName:
-          nullable: true
-          type: string
-        isDiscountFrozen:
-          type: boolean
-        hasGuestPrivs:
-          type: boolean
-        bannerComment:
-          type: string
-          nullable: true
-        signoutBlockReason:
-          type: string
-          nullable: true
-    CardScanResultRating:
-      type: object
-      properties:
-        ratingId:
-          type: number
-        programId:
-          type: number
-        ratingName:
-          type: string
-        status:
-          type: string
-          enum: [Y,F]
-    CardScanResult:
-      type: object
-      properties:
-        personId:
-          type: number
-        cardNumber:
-          type: string
-        nameFirst:
-          type: string
-        nameLast:
-          type: string
-        bannerComment:
-          nullable: true
-          type: string
-        specialNeeds:
-          nullable: true
-          type: string
-        activeMemberships:
-          type: array
-          items:
-            $ref: "#/components/schemas/CardScanResultMembership"
-        personRatings:
-          type: array
-          items:
-            $ref: "#/components/schemas/CardScanResultRating"
-        apClassSignupsToday:
-          type: array
-          items:
-            type: object
-            properties:
-              signupId:
-                type: number
-              instanceId:
-                type: number
-              personId:
-                type: number
-              signupType:
-                type: string
-              signupDatetime:
-                type: string
-              sequence:
-                type: number
-        jpClassSignupsToday:
-          type: array
-          items:
-            type: object
-            properties:
-              signupId:
-                type: number
-              instanceId:
-                type: number
-              personId:
-                type: number
-              signupType:
-                type: string
-              signupDatetime:
-                type: string
-              sequence:
-                type: number
-        maxFlagsPerBoat:
-          type: array
-          items:
-            type: object
-            properties:
-              $$boatType:
-                type: object
-                properties:
-                  boatId:
-                    type: number
-              $$programId:
-                type: object
-                properties:
-                  programId:
-                    type: number
-              maxFlag:
-                type: string
-    CreateSignoutCrew:
-      type: object
-      properties:
-        personId:
-          type: number
-        cardNumber:
-          type: string
-        testRatingId:
-          nullable: true
-          type: number
-    CreateSignout:
-      type: object
-      properties:
-        skipperPersonId:
-          type: number
-        programId:
-          type: number
-        skipperCardNumber:
-          type: string
-        skipperTestRatingId:
-          nullable: true
-          type: number
-        boatId:
-          type: number
-        sailNumber:
-          nullable: true
-          type: string
-        hullNumber:
-          nullable: true
-          type: string
-        classSessionId:
-          nullable: true
-          type: number
-        isRacing:
-          type: boolean
-        dockmasterOverride:
-          type: boolean
-        didInformKayakRules:
-          type: boolean
-        signoutCrew:
-          type: array
-          items:
-            $ref: "#/components/schemas/CreateSignoutCrew"
-    Signout:
-      type: object
-      properties:
-        signoutId:
-          type: number
-        programId:
-          type: number
-        boatId:
-          type: number
-        personId:
-          type: number
-        cardNumber:
-          type: string
-        sailNumber:
-          type: string
-        hullNumber:
-          type: string
-        signoutDatetime:
-          type: string
-        signinDatetime:
-          type: string
-        testRatingId:
-          type: number
-        testResult:
-          type: string
-        signoutType:
-          type: string
-        didCapsize:
-          type: boolean
-        comments:
-          type: string
-        crew:
-          type: array
-          items:
-            $ref: "#/components/schemas/SignoutCrew"
-    SignoutCrew:
-      type: object
-      properties:
-        crewId:
-          type: number
-        signoutId:
-          type: number
-        cardNumber:
-          type: string
-        personId:
-          type: number
-        startActive:
-          type: string
-        endActive:
-          type: string
-    ApClassType:
-      type: object
-      properties:
-        signupMinDefault:
-          type: number
-          nullable: true
-        noSignup:
-          type: boolean
-        disallowIfOverkill:
-          type: boolean
-        signupMaxDefault:
-          type: number
-          nullable: true
-        typeId:
-          type: number
-        typeName:
-          type: string
-        priceDefault:
-          type: number
-          nullable: true
-        displayOrder:
-          type: number
-    ApClassFormat:
-      type: object
-      properties:
-        sessionLengthDefault:
-          type: number
-        typeId:
-          type: number
-        signupMinDefaultOverride:
-          type: number
-          nullable: true
-        signupMaxDefaultOverride:
-          type: number
-          nullable: true
-        formatId:
-          type: number
-        priceDefaultOverride:
-          type: number
-          nullable: true
-        sessionCtDefault:
-          type: number
-        $$apClassType:
-          $ref: "#/components/schemas/ApClassType"
-    ApClassInstance:
-      type: object
-      properties:
-        instanceId:
-          type: number
-        cancelledDatetime:
-          type: string
-          nullable: true
-        signupsStartOverride:
-          type: string
-          nullable: true
-        signupMin:
-          type: number
-          nullable: true
-        price:
-          type: number
-          nullable: true
-        signupMax:
-          type: number
-          nullable: true
-        formatId:
-          type: number
-        hideOnline:
-          type: boolean
-        cancelByOverride:
-          type: string
-          nullable: true
-        locationString:
-          type: string
-          nullable: true
-        $$apClassSignups:
-          type: array
-          items:
-            $ref: "#/components/schemas/ApClassSignup"
-    ApClassSignup:
-      type: object
-      properties:
-        instanceId:
-          type: number
-        discountInstanceId:
-          type: number
-          nullable: true
-        voidedOnline:
-          type: boolean
-        $$apClassWaitlistResult:
-          type: object
-          nullable: true
-          properties:
-            wlResult:
-              type: string
-            foVmDatetime:
-              type: string
-            offerExpDatetime:
-              type: string
-            signupId:
-              type: number
-            foAlertDatetime:
-              type: string
-        personId:
-          type: number
-        orderId:
-          type: number
-          nullable: true
-        price:
-          type: number
-          nullable: true
-        signupId:
-          type: number
-        $$person:
-          type: object
-          properties:
-            personId:
-              type: number
-            nameFirst:
-              type: string
-            nameLast:
-              type: string
-        closeId:
-          type: number
-          nullable: true
-        sequence:
-          type: number
-        paymentMedium:
-          type: string
-          nullable: true
-        ccTransNum:
-          type: string
-          nullable: true
-        paymentLocation:
-          type: string
-          nullable: true
-        voidCloseId:
-          type: number
-          nullable: true
-        signupType:
-          type: string
-        signupNote:
-          type: string
-          nullable: true
-        signupDatetime:
-          type: string
-    ApClassSession:
-      type: object
-      properties:
-        instanceId:
-          type: number
-        sessionId:
-          type: number
-        cancelledDateTime:
-          type: string
-          nullable: true
-        sessionDateTime:
-          type: string
-        headcount:
-          type: number
-          nullable: true
-        sessionLength:
-          type: number
-        $$apClassInstance:
-          $ref: "#/components/schemas/ApClassInstance"
\ No newline at end of file
diff --git a/entity-templates/AcctLink.scala b/entity-templates/AcctLink.scala
deleted file mode 100644
index 51f4d972..00000000
--- a/entity-templates/AcctLink.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class AcctLink extends StorableClass(AcctLink) {
-	object values extends ValuesObject {
-		val a = new NullableDoubleFieldValue(self, AcctLink.fields.a)
-		val b = new NullableDoubleFieldValue(self, AcctLink.fields.b)
-		val typeId = new NullableIntFieldValue(self, AcctLink.fields.typeId)
-	}
-}
-
-object AcctLink extends StorableObject[AcctLink] {
-	val entityName: String = "ACCT_LINKS"
-
-	object fields extends FieldsObject {
-		val a = new NullableDoubleDatabaseField(self, "A")
-		val b = new NullableDoubleDatabaseField(self, "B")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ActiveApMember.scala b/entity-templates/ActiveApMember.scala
deleted file mode 100644
index f4ef7f11..00000000
--- a/entity-templates/ActiveApMember.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ActiveApMember extends StorableClass(ActiveApMember) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, ActiveApMember.fields.personId)
-	}
-}
-
-object ActiveApMember extends StorableObject[ActiveApMember] {
-	val entityName: String = "ACTIVE_AP_MEMBERS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ActiveHsMember.scala b/entity-templates/ActiveHsMember.scala
deleted file mode 100644
index 5138bffd..00000000
--- a/entity-templates/ActiveHsMember.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ActiveHsMember extends StorableClass(ActiveHsMember) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, ActiveHsMember.fields.personId)
-	}
-}
-
-object ActiveHsMember extends StorableObject[ActiveHsMember] {
-	val entityName: String = "ACTIVE_HS_MEMBERS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ActiveJpMember.scala b/entity-templates/ActiveJpMember.scala
deleted file mode 100644
index 08a16f07..00000000
--- a/entity-templates/ActiveJpMember.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ActiveJpMember extends StorableClass(ActiveJpMember) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, ActiveJpMember.fields.personId)
-	}
-}
-
-object ActiveJpMember extends StorableObject[ActiveJpMember] {
-	val entityName: String = "ACTIVE_JP_MEMBERS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ActiveStripeToken.scala b/entity-templates/ActiveStripeToken.scala
deleted file mode 100644
index 10262e54..00000000
--- a/entity-templates/ActiveStripeToken.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ActiveStripeToken extends StorableClass(ActiveStripeToken) {
-	object values extends ValuesObject {
-		val tokenId = new IntFieldValue(self, ActiveStripeToken.fields.tokenId)
-		val orderId = new NullableIntFieldValue(self, ActiveStripeToken.fields.orderId)
-		val token = new NullableStringFieldValue(self, ActiveStripeToken.fields.token)
-		val createdDatetime = new NullableLocalDateTimeFieldValue(self, ActiveStripeToken.fields.createdDatetime)
-		val cardLastDigits = new NullableStringFieldValue(self, ActiveStripeToken.fields.cardLastDigits)
-		val cardExpMonth = new NullableDoubleFieldValue(self, ActiveStripeToken.fields.cardExpMonth)
-		val cardExpYear = new NullableDoubleFieldValue(self, ActiveStripeToken.fields.cardExpYear)
-		val cardZip = new NullableStringFieldValue(self, ActiveStripeToken.fields.cardZip)
-	}
-}
-
-object ActiveStripeToken extends StorableObject[ActiveStripeToken] {
-	val entityName: String = "ACTIVE_STRIPE_TOKENS"
-
-	object fields extends FieldsObject {
-		val tokenId = new IntDatabaseField(self, "TOKEN_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val token = new NullableStringDatabaseField(self, "TOKEN", 50)
-		val createdDatetime = new NullableLocalDateTimeDatabaseField(self, "CREATED_DATETIME")
-		val cardLastDigits = new NullableStringDatabaseField(self, "CARD_LAST_DIGITS", 10)
-		val cardExpMonth = new NullableDoubleDatabaseField(self, "CARD_EXP_MONTH")
-		val cardExpYear = new NullableDoubleDatabaseField(self, "CARD_EXP_YEAR")
-		val cardZip = new NullableStringDatabaseField(self, "CARD_ZIP", 20)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ActiveUapMember.scala b/entity-templates/ActiveUapMember.scala
deleted file mode 100644
index ae0ce59c..00000000
--- a/entity-templates/ActiveUapMember.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ActiveUapMember extends StorableClass(ActiveUapMember) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, ActiveUapMember.fields.personId)
-	}
-}
-
-object ActiveUapMember extends StorableObject[ActiveUapMember] {
-	val entityName: String = "ACTIVE_UAP_MEMBERS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/AllCrew.scala b/entity-templates/AllCrew.scala
deleted file mode 100644
index 7c905fcd..00000000
--- a/entity-templates/AllCrew.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class AllCrew extends StorableClass(AllCrew) {
-	object values extends ValuesObject {
-		val pk = new NullableDoubleFieldValue(self, AllCrew.fields.pk)
-		val nameFirst = new NullableStringFieldValue(self, AllCrew.fields.nameFirst)
-		val nameLast = new NullableStringFieldValue(self, AllCrew.fields.nameLast)
-		val cardNum = new NullableStringFieldValue(self, AllCrew.fields.cardNum)
-		val signoutId = new NullableIntFieldValue(self, AllCrew.fields.signoutId)
-		val cI = new NullableBooleanFIeldValue(self, AllCrew.fields.cI)
-		val startActive = new NullableLocalDateTimeFieldValue(self, AllCrew.fields.startActive)
-		val endActive = new NullableLocalDateTimeFieldValue(self, AllCrew.fields.endActive)
-		val personId = new NullableIntFieldValue(self, AllCrew.fields.personId)
-	}
-}
-
-object AllCrew extends StorableObject[AllCrew] {
-	val entityName: String = "ALL_CREW"
-
-	object fields extends FieldsObject {
-		val pk = new NullableDoubleDatabaseField(self, "PK")
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val signoutId = new NullableIntDatabaseField(self, "SIGNOUT_ID")
-		val cI = new NullableBooleanDatabaseField(self, "C_I")
-		val startActive = new NullableLocalDateTimeDatabaseField(self, "START_ACTIVE")
-		val endActive = new NullableLocalDateTimeDatabaseField(self, "END_ACTIVE")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassAttendance.scala b/entity-templates/ApClassAttendance.scala
deleted file mode 100644
index a15ae443..00000000
--- a/entity-templates/ApClassAttendance.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassAttendance extends StorableClass(ApClassAttendance) {
-	object values extends ValuesObject {
-		val attendId = new IntFieldValue(self, ApClassAttendance.fields.attendId)
-		val sessionId = new NullableIntFieldValue(self, ApClassAttendance.fields.sessionId)
-		val signupId = new NullableIntFieldValue(self, ApClassAttendance.fields.signupId)
-		val attend = new NullableBooleanFIeldValue(self, ApClassAttendance.fields.attend)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassAttendance.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassAttendance.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassAttendance.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassAttendance.fields.updatedBy)
-	}
-}
-
-object ApClassAttendance extends StorableObject[ApClassAttendance] {
-	val entityName: String = "AP_CLASS_ATTENDANCE"
-
-	object fields extends FieldsObject {
-		val attendId = new IntDatabaseField(self, "ATTEND_ID")
-		val sessionId = new NullableIntDatabaseField(self, "SESSION_ID")
-		val signupId = new NullableIntDatabaseField(self, "SIGNUP_ID")
-		val attend = new NullableBooleanDatabaseField(self, "ATTEND")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.attendId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassBookend.scala b/entity-templates/ApClassBookend.scala
deleted file mode 100644
index 0c1cbd9f..00000000
--- a/entity-templates/ApClassBookend.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassBookend extends StorableClass(ApClassBookend) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, ApClassBookend.fields.instanceId)
-		val firstSession = new DoubleFieldValue(self, ApClassBookend.fields.firstSession)
-		val lastSession = new DoubleFieldValue(self, ApClassBookend.fields.lastSession)
-	}
-}
-
-object ApClassBookend extends StorableObject[ApClassBookend] {
-	val entityName: String = "AP_CLASS_BOOKENDS"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val firstSession = new DoubleDatabaseField(self, "FIRST_SESSION")
-		val lastSession = new DoubleDatabaseField(self, "LAST_SESSION")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassCancellationTime.scala b/entity-templates/ApClassCancellationTime.scala
deleted file mode 100644
index 6e565efc..00000000
--- a/entity-templates/ApClassCancellationTime.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassCancellationTime extends StorableClass(ApClassCancellationTime) {
-	object values extends ValuesObject {
-		val doNotAutoCancel = new NullableBooleanFIeldValue(self, ApClassCancellationTime.fields.doNotAutoCancel)
-		val typeId = new IntFieldValue(self, ApClassCancellationTime.fields.typeId)
-		val instanceId = new IntFieldValue(self, ApClassCancellationTime.fields.instanceId)
-		val sessionDatetime = new LocalDateTimeFieldValue(self, ApClassCancellationTime.fields.sessionDatetime)
-		val typeName = new StringFieldValue(self, ApClassCancellationTime.fields.typeName)
-		val signupMin = new NullableDoubleFieldValue(self, ApClassCancellationTime.fields.signupMin)
-		val enrolledCt = new NullableDoubleFieldValue(self, ApClassCancellationTime.fields.enrolledCt)
-		val wlCt = new NullableDoubleFieldValue(self, ApClassCancellationTime.fields.wlCt)
-		val daysUntil = new NullableDoubleFieldValue(self, ApClassCancellationTime.fields.daysUntil)
-	}
-}
-
-object ApClassCancellationTime extends StorableObject[ApClassCancellationTime] {
-	val entityName: String = "AP_CLASS_CANCELLATION_TIMES"
-
-	object fields extends FieldsObject {
-		val doNotAutoCancel = new NullableBooleanDatabaseField(self, "DO_NOT_AUTO_CANCEL")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val sessionDatetime = new LocalDateTimeDatabaseField(self, "SESSION_DATETIME")
-		val typeName = new StringDatabaseField(self, "TYPE_NAME", 200)
-		val signupMin = new NullableDoubleDatabaseField(self, "SIGNUP_MIN")
-		val enrolledCt = new NullableDoubleDatabaseField(self, "ENROLLED_CT")
-		val wlCt = new NullableDoubleDatabaseField(self, "WL_CT")
-		val daysUntil = new NullableDoubleDatabaseField(self, "DAYS_UNTIL")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassFormat.scala b/entity-templates/ApClassFormat.scala
deleted file mode 100644
index 6a95b516..00000000
--- a/entity-templates/ApClassFormat.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassFormat extends StorableClass(ApClassFormat) {
-	object values extends ValuesObject {
-		val formatId = new IntFieldValue(self, ApClassFormat.fields.formatId)
-		val typeId = new IntFieldValue(self, ApClassFormat.fields.typeId)
-		val description = new NullableStringFieldValue(self, ApClassFormat.fields.description)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassFormat.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassFormat.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassFormat.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassFormat.fields.updatedBy)
-		val signupMinDefaultOverride = new NullableDoubleFieldValue(self, ApClassFormat.fields.signupMinDefaultOverride)
-		val signupMaxDefaultOverride = new NullableDoubleFieldValue(self, ApClassFormat.fields.signupMaxDefaultOverride)
-		val sessionCtDefault = new NullableDoubleFieldValue(self, ApClassFormat.fields.sessionCtDefault)
-		val sessionLengthDefault = new NullableDoubleFieldValue(self, ApClassFormat.fields.sessionLengthDefault)
-		val priceDefaultOverride = new NullableDoubleFieldValue(self, ApClassFormat.fields.priceDefaultOverride)
-	}
-}
-
-object ApClassFormat extends StorableObject[ApClassFormat] {
-	val entityName: String = "AP_CLASS_FORMATS"
-
-	object fields extends FieldsObject {
-		val formatId = new IntDatabaseField(self, "FORMAT_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 1000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val signupMinDefaultOverride = new NullableDoubleDatabaseField(self, "SIGNUP_MIN_DEFAULT_OVERRIDE")
-		val signupMaxDefaultOverride = new NullableDoubleDatabaseField(self, "SIGNUP_MAX_DEFAULT_OVERRIDE")
-		val sessionCtDefault = new NullableDoubleDatabaseField(self, "SESSION_CT_DEFAULT")
-		val sessionLengthDefault = new NullableDoubleDatabaseField(self, "SESSION_LENGTH_DEFAULT")
-		val priceDefaultOverride = new NullableDoubleDatabaseField(self, "PRICE_DEFAULT_OVERRIDE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.formatId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassInstance.scala b/entity-templates/ApClassInstance.scala
deleted file mode 100644
index 5b205479..00000000
--- a/entity-templates/ApClassInstance.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassInstance extends StorableClass(ApClassInstance) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, ApClassInstance.fields.instanceId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassInstance.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassInstance.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassInstance.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassInstance.fields.updatedBy)
-		val signupsStartOverride = new NullableLocalDateTimeFieldValue(self, ApClassInstance.fields.signupsStartOverride)
-		val signupMin = new NullableDoubleFieldValue(self, ApClassInstance.fields.signupMin)
-		val signupMax = new NullableDoubleFieldValue(self, ApClassInstance.fields.signupMax)
-		val formatId = new IntFieldValue(self, ApClassInstance.fields.formatId)
-		val cancelByOverride = new NullableLocalDateTimeFieldValue(self, ApClassInstance.fields.cancelByOverride)
-		val price = new NullableDoubleFieldValue(self, ApClassInstance.fields.price)
-		val cancelledDatetime = new NullableLocalDateTimeFieldValue(self, ApClassInstance.fields.cancelledDatetime)
-		val doNotAutoCancel = new NullableBooleanFIeldValue(self, ApClassInstance.fields.doNotAutoCancel)
-		val hideOnline = new NullableBooleanFIeldValue(self, ApClassInstance.fields.hideOnline)
-		val locationString = new NullableStringFieldValue(self, ApClassInstance.fields.locationString)
-	}
-}
-
-object ApClassInstance extends StorableObject[ApClassInstance] {
-	val entityName: String = "AP_CLASS_INSTANCES"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val signupsStartOverride = new NullableLocalDateTimeDatabaseField(self, "SIGNUPS_START_OVERRIDE")
-		val signupMin = new NullableDoubleDatabaseField(self, "SIGNUP_MIN")
-		val signupMax = new NullableDoubleDatabaseField(self, "SIGNUP_MAX")
-		val formatId = new IntDatabaseField(self, "FORMAT_ID")
-		val cancelByOverride = new NullableLocalDateTimeDatabaseField(self, "CANCEL_BY_OVERRIDE")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val cancelledDatetime = new NullableLocalDateTimeDatabaseField(self, "CANCELLED_DATETIME")
-		val doNotAutoCancel = new NullableBooleanDatabaseField(self, "DO_NOT_AUTO_CANCEL")
-		val hideOnline = new NullableBooleanDatabaseField(self, "HIDE_ONLINE")
-		val locationString = new NullableStringDatabaseField(self, "LOCATION_STRING", 100)
-	}
-
-	def primaryKey: IntDatabaseField = fields.instanceId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassSession.scala b/entity-templates/ApClassSession.scala
deleted file mode 100644
index 7888ef09..00000000
--- a/entity-templates/ApClassSession.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassSession extends StorableClass(ApClassSession) {
-	object values extends ValuesObject {
-		val sessionId = new IntFieldValue(self, ApClassSession.fields.sessionId)
-		val instanceId = new IntFieldValue(self, ApClassSession.fields.instanceId)
-		val sessionDatetime = new LocalDateTimeFieldValue(self, ApClassSession.fields.sessionDatetime)
-		val isMakeup = new NullableBooleanFIeldValue(self, ApClassSession.fields.isMakeup)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassSession.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassSession.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassSession.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassSession.fields.updatedBy)
-		val headcount = new NullableDoubleFieldValue(self, ApClassSession.fields.headcount)
-		val cancelledDatetime = new NullableLocalDateTimeFieldValue(self, ApClassSession.fields.cancelledDatetime)
-		val sessionLength = new DoubleFieldValue(self, ApClassSession.fields.sessionLength)
-	}
-}
-
-object ApClassSession extends StorableObject[ApClassSession] {
-	val entityName: String = "AP_CLASS_SESSIONS"
-
-	object fields extends FieldsObject {
-		val sessionId = new IntDatabaseField(self, "SESSION_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val sessionDatetime = new LocalDateTimeDatabaseField(self, "SESSION_DATETIME")
-		val isMakeup = new NullableBooleanDatabaseField(self, "IS_MAKEUP")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val headcount = new NullableDoubleDatabaseField(self, "HEADCOUNT")
-		val cancelledDatetime = new NullableLocalDateTimeDatabaseField(self, "CANCELLED_DATETIME")
-		val sessionLength = new DoubleDatabaseField(self, "SESSION_LENGTH")
-	}
-
-	def primaryKey: IntDatabaseField = fields.sessionId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassSignup.scala b/entity-templates/ApClassSignup.scala
deleted file mode 100644
index 110bfeb3..00000000
--- a/entity-templates/ApClassSignup.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassSignup extends StorableClass(ApClassSignup) {
-	object values extends ValuesObject {
-		val signupId = new IntFieldValue(self, ApClassSignup.fields.signupId)
-		val instanceId = new NullableIntFieldValue(self, ApClassSignup.fields.instanceId)
-		val personId = new NullableIntFieldValue(self, ApClassSignup.fields.personId)
-		val orderId = new NullableIntFieldValue(self, ApClassSignup.fields.orderId)
-		val signupDatetime = new NullableLocalDateTimeFieldValue(self, ApClassSignup.fields.signupDatetime)
-		val sequence = new NullableDoubleFieldValue(self, ApClassSignup.fields.sequence)
-		val signupType = new NullableBooleanFIeldValue(self, ApClassSignup.fields.signupType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassSignup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassSignup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassSignup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassSignup.fields.updatedBy)
-		val price = new NullableDoubleFieldValue(self, ApClassSignup.fields.price)
-		val closeId = new NullableIntFieldValue(self, ApClassSignup.fields.closeId)
-		val discountInstanceId = new NullableIntFieldValue(self, ApClassSignup.fields.discountInstanceId)
-		val paymentMedium = new NullableStringFieldValue(self, ApClassSignup.fields.paymentMedium)
-		val ccTransNum = new NullableStringFieldValue(self, ApClassSignup.fields.ccTransNum)
-		val voidCloseId = new NullableIntFieldValue(self, ApClassSignup.fields.voidCloseId)
-		val signupNote = new NullableStringFieldValue(self, ApClassSignup.fields.signupNote)
-		val voidedOnline = new NullableBooleanFIeldValue(self, ApClassSignup.fields.voidedOnline)
-		val paymentLocation = new NullableStringFieldValue(self, ApClassSignup.fields.paymentLocation)
-	}
-}
-
-object ApClassSignup extends StorableObject[ApClassSignup] {
-	val entityName: String = "AP_CLASS_SIGNUPS"
-
-	object fields extends FieldsObject {
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val signupDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNUP_DATETIME")
-		val sequence = new NullableDoubleDatabaseField(self, "SEQUENCE")
-		val signupType = new NullableBooleanDatabaseField(self, "SIGNUP_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 50)
-		val ccTransNum = new NullableStringDatabaseField(self, "CC_TRANS_NUM", 50)
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val signupNote = new NullableStringDatabaseField(self, "SIGNUP_NOTE", 4000)
-		val voidedOnline = new NullableBooleanDatabaseField(self, "VOIDED_ONLINE")
-		val paymentLocation = new NullableStringDatabaseField(self, "PAYMENT_LOCATION", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.signupId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassType.scala b/entity-templates/ApClassType.scala
deleted file mode 100644
index 0231d0ff..00000000
--- a/entity-templates/ApClassType.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassType extends StorableClass(ApClassType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, ApClassType.fields.typeId)
-		val typeName = new StringFieldValue(self, ApClassType.fields.typeName)
-		val ratingPrereq = new NullableDoubleFieldValue(self, ApClassType.fields.ratingPrereq)
-		val classPrereq = new NullableDoubleFieldValue(self, ApClassType.fields.classPrereq)
-		val ratingOverkill = new NullableDoubleFieldValue(self, ApClassType.fields.ratingOverkill)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassType.fields.updatedBy)
-		val displayOrder = new NullableDoubleFieldValue(self, ApClassType.fields.displayOrder)
-		val descShort = new NullableUnknownFieldType(self, ApClassType.fields.descShort)
-		val descLong = new NullableUnknownFieldType(self, ApClassType.fields.descLong)
-		val classOverkill = new NullableDoubleFieldValue(self, ApClassType.fields.classOverkill)
-		val colorCode = new NullableStringFieldValue(self, ApClassType.fields.colorCode)
-		val noSignup = new NullableBooleanFIeldValue(self, ApClassType.fields.noSignup)
-		val priceDefault = new NullableDoubleFieldValue(self, ApClassType.fields.priceDefault)
-		val signupMinDefault = new NullableDoubleFieldValue(self, ApClassType.fields.signupMinDefault)
-		val signupMaxDefault = new NullableDoubleFieldValue(self, ApClassType.fields.signupMaxDefault)
-		val disallowIfOverkill = new NullableBooleanFIeldValue(self, ApClassType.fields.disallowIfOverkill)
-	}
-}
-
-object ApClassType extends StorableObject[ApClassType] {
-	val entityName: String = "AP_CLASS_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new StringDatabaseField(self, "TYPE_NAME", 200)
-		val ratingPrereq = new NullableDoubleDatabaseField(self, "RATING_PREREQ")
-		val classPrereq = new NullableDoubleDatabaseField(self, "CLASS_PREREQ")
-		val ratingOverkill = new NullableDoubleDatabaseField(self, "RATING_OVERKILL")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val descShort = new NullableUnknownFieldType(self, "DESC_SHORT")
-		val descLong = new NullableUnknownFieldType(self, "DESC_LONG")
-		val classOverkill = new NullableDoubleDatabaseField(self, "CLASS_OVERKILL")
-		val colorCode = new NullableStringDatabaseField(self, "COLOR_CODE")
-		val noSignup = new NullableBooleanDatabaseField(self, "NO_SIGNUP")
-		val priceDefault = new NullableDoubleDatabaseField(self, "PRICE_DEFAULT")
-		val signupMinDefault = new NullableDoubleDatabaseField(self, "SIGNUP_MIN_DEFAULT")
-		val signupMaxDefault = new NullableDoubleDatabaseField(self, "SIGNUP_MAX_DEFAULT")
-		val disallowIfOverkill = new NullableBooleanDatabaseField(self, "DISALLOW_IF_OVERKILL")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassTypeOverride.scala b/entity-templates/ApClassTypeOverride.scala
deleted file mode 100644
index c82cdb91..00000000
--- a/entity-templates/ApClassTypeOverride.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassTypeOverride extends StorableClass(ApClassTypeOverride) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, ApClassTypeOverride.fields.rowId)
-		val personId = new IntFieldValue(self, ApClassTypeOverride.fields.personId)
-		val typeId = new IntFieldValue(self, ApClassTypeOverride.fields.typeId)
-		val season = new DoubleFieldValue(self, ApClassTypeOverride.fields.season)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassTypeOverride.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassTypeOverride.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassTypeOverride.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassTypeOverride.fields.updatedBy)
-		val isForOverkill = new BooleanFIeldValue(self, ApClassTypeOverride.fields.isForOverkill)
-	}
-}
-
-object ApClassTypeOverride extends StorableObject[ApClassTypeOverride] {
-	val entityName: String = "AP_CLASS_TYPE_OVERRIDES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val season = new DoubleDatabaseField(self, "SEASON")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val isForOverkill = new BooleanDatabaseField(self, "IS_FOR_OVERKILL")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassTypesSeason.scala b/entity-templates/ApClassTypesSeason.scala
deleted file mode 100644
index 01776f56..00000000
--- a/entity-templates/ApClassTypesSeason.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassTypesSeason extends StorableClass(ApClassTypesSeason) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, ApClassTypesSeason.fields.assignId)
-		val typeId = new IntFieldValue(self, ApClassTypesSeason.fields.typeId)
-		val season = new DoubleFieldValue(self, ApClassTypesSeason.fields.season)
-	}
-}
-
-object ApClassTypesSeason extends StorableObject[ApClassTypesSeason] {
-	val entityName: String = "AP_CLASS_TYPES_SEASONS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val season = new DoubleDatabaseField(self, "SEASON")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassVoucher.scala b/entity-templates/ApClassVoucher.scala
deleted file mode 100644
index 8d0e1ad4..00000000
--- a/entity-templates/ApClassVoucher.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassVoucher extends StorableClass(ApClassVoucher) {
-	object values extends ValuesObject {
-		val voucherId = new IntFieldValue(self, ApClassVoucher.fields.voucherId)
-		val personId = new IntFieldValue(self, ApClassVoucher.fields.personId)
-		val season = new DoubleFieldValue(self, ApClassVoucher.fields.season)
-		val value = new DoubleFieldValue(self, ApClassVoucher.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassVoucher.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassVoucher.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassVoucher.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassVoucher.fields.updatedBy)
-		val closeId = new IntFieldValue(self, ApClassVoucher.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, ApClassVoucher.fields.voidCloseId)
-		val signupId = new NullableIntFieldValue(self, ApClassVoucher.fields.signupId)
-		val createdOnline = new NullableBooleanFIeldValue(self, ApClassVoucher.fields.createdOnline)
-	}
-}
-
-object ApClassVoucher extends StorableObject[ApClassVoucher] {
-	val entityName: String = "AP_CLASS_VOUCHERS"
-
-	object fields extends FieldsObject {
-		val voucherId = new IntDatabaseField(self, "VOUCHER_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val season = new DoubleDatabaseField(self, "SEASON")
-		val value = new DoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val signupId = new NullableIntDatabaseField(self, "SIGNUP_ID")
-		val createdOnline = new NullableBooleanDatabaseField(self, "CREATED_ONLINE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.voucherId
-}
\ No newline at end of file
diff --git a/entity-templates/ApClassWlResult.scala b/entity-templates/ApClassWlResult.scala
deleted file mode 100644
index 2f13f79a..00000000
--- a/entity-templates/ApClassWlResult.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApClassWlResult extends StorableClass(ApClassWlResult) {
-	object values extends ValuesObject {
-		val signupId = new IntFieldValue(self, ApClassWlResult.fields.signupId)
-		val foVmDatetime = new NullableLocalDateTimeFieldValue(self, ApClassWlResult.fields.foVmDatetime)
-		val wlResult = new NullableBooleanFIeldValue(self, ApClassWlResult.fields.wlResult)
-		val offerExpDatetime = new NullableLocalDateTimeFieldValue(self, ApClassWlResult.fields.offerExpDatetime)
-		val foAlertDatetime = new NullableLocalDateTimeFieldValue(self, ApClassWlResult.fields.foAlertDatetime)
-		val permitOvercrowd = new NullableBooleanFIeldValue(self, ApClassWlResult.fields.permitOvercrowd)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApClassWlResult.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApClassWlResult.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApClassWlResult.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApClassWlResult.fields.updatedBy)
-	}
-}
-
-object ApClassWlResult extends StorableObject[ApClassWlResult] {
-	val entityName: String = "AP_CLASS_WL_RESULTS"
-
-	object fields extends FieldsObject {
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val foVmDatetime = new NullableLocalDateTimeDatabaseField(self, "FO_VM_DATETIME")
-		val wlResult = new NullableBooleanDatabaseField(self, "WL_RESULT")
-		val offerExpDatetime = new NullableLocalDateTimeDatabaseField(self, "OFFER_EXP_DATETIME")
-		val foAlertDatetime = new NullableLocalDateTimeDatabaseField(self, "FO_ALERT_DATETIME")
-		val permitOvercrowd = new NullableBooleanDatabaseField(self, "PERMIT_OVERCROWD")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.signupId
-}
\ No newline at end of file
diff --git a/entity-templates/ApCurrentMembership.scala b/entity-templates/ApCurrentMembership.scala
deleted file mode 100644
index f03169c9..00000000
--- a/entity-templates/ApCurrentMembership.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApCurrentMembership extends StorableClass(ApCurrentMembership) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, ApCurrentMembership.fields.personId)
-		val membershipTypeName = new NullableStringFieldValue(self, ApCurrentMembership.fields.membershipTypeName)
-		val programPriority = new NullableDoubleFieldValue(self, ApCurrentMembership.fields.programPriority)
-		val assignId = new IntFieldValue(self, ApCurrentMembership.fields.assignId)
-	}
-}
-
-object ApCurrentMembership extends StorableObject[ApCurrentMembership] {
-	val entityName: String = "AP_CURRENT_MEMBERSHIPS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val membershipTypeName = new NullableStringDatabaseField(self, "MEMBERSHIP_TYPE_NAME", 200)
-		val programPriority = new NullableDoubleDatabaseField(self, "PROGRAM_PRIORITY")
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRpt.scala b/entity-templates/ApDockRpt.scala
deleted file mode 100644
index 68d74a8b..00000000
--- a/entity-templates/ApDockRpt.scala
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRpt extends StorableClass(ApDockRpt) {
-	object values extends ValuesObject {
-		val drId = new IntFieldValue(self, ApDockRpt.fields.drId)
-		val mercSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.mercSo)
-		val kmSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.kmSo)
-		val uapkmSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.uapkmSo)
-		val r19So = new NullableDoubleFieldValue(self, ApDockRpt.fields.r19So)
-		val sonarSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.sonarSo)
-		val laserSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.laserSo)
-		val 420So = new NullableDoubleFieldValue(self, ApDockRpt.fields.420So)
-		val wsSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.wsSo)
-		val kayakSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.kayakSo)
-		val supSo = new NullableDoubleFieldValue(self, ApDockRpt.fields.supSo)
-		val mercUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.mercUsed)
-		val kmUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.kmUsed)
-		val uapkmUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.uapkmUsed)
-		val r19Used = new NullableDoubleFieldValue(self, ApDockRpt.fields.r19Used)
-		val sonarUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.sonarUsed)
-		val laserUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.laserUsed)
-		val 420Used = new NullableDoubleFieldValue(self, ApDockRpt.fields.420Used)
-		val wsUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.wsUsed)
-		val kayakUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.kayakUsed)
-		val supUsed = new NullableDoubleFieldValue(self, ApDockRpt.fields.supUsed)
-		val mercUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.mercUnavail)
-		val kmUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.kmUnavail)
-		val uapkmUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.uapkmUnavail)
-		val r19Unavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.r19Unavail)
-		val sonarUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.sonarUnavail)
-		val laserUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.laserUnavail)
-		val 420Unavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.420Unavail)
-		val wsUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.wsUnavail)
-		val kayakUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.kayakUnavail)
-		val supUnavail = new NullableDoubleFieldValue(self, ApDockRpt.fields.supUnavail)
-		val skippers = new NullableDoubleFieldValue(self, ApDockRpt.fields.skippers)
-		val crew = new NullableDoubleFieldValue(self, ApDockRpt.fields.crew)
-		val over18Guests = new NullableDoubleFieldValue(self, ApDockRpt.fields.over18Guests)
-		val under18Guests = new NullableDoubleFieldValue(self, ApDockRpt.fields.under18Guests)
-		val instructees = new NullableDoubleFieldValue(self, ApDockRpt.fields.instructees)
-		val uapSailors = new NullableDoubleFieldValue(self, ApDockRpt.fields.uapSailors)
-		val highSchools = new NullableDoubleFieldValue(self, ApDockRpt.fields.highSchools)
-		val hsSailors = new NullableDoubleFieldValue(self, ApDockRpt.fields.hsSailors)
-		val runAgrounds = new NullableDoubleFieldValue(self, ApDockRpt.fields.runAgrounds)
-		val capsizes = new NullableDoubleFieldValue(self, ApDockRpt.fields.capsizes)
-		val maxWait = new NullableDoubleFieldValue(self, ApDockRpt.fields.maxWait)
-		val 1daySails = new NullableDoubleFieldValue(self, ApDockRpt.fields.1daySails)
-		val 1dayKayaks = new NullableDoubleFieldValue(self, ApDockRpt.fields.1dayKayaks)
-		val incidents = new NullableStringFieldValue(self, ApDockRpt.fields.incidents)
-		val activities = new NullableStringFieldValue(self, ApDockRpt.fields.activities)
-		val crwaFlag = new NullableStringFieldValue(self, ApDockRpt.fields.crwaFlag)
-		val waterTemp = new NullableDoubleFieldValue(self, ApDockRpt.fields.waterTemp)
-		val htCaptain = new NullableStringFieldValue(self, ApDockRpt.fields.htCaptain)
-		val htcCheckIn = new NullableStringFieldValue(self, ApDockRpt.fields.htcCheckIn)
-		val htcSailorRep = new NullableStringFieldValue(self, ApDockRpt.fields.htcSailorRep)
-		val htSailors = new NullableDoubleFieldValue(self, ApDockRpt.fields.htSailors)
-		val htBoats = new NullableDoubleFieldValue(self, ApDockRpt.fields.htBoats)
-		val htDestination = new NullableStringFieldValue(self, ApDockRpt.fields.htDestination)
-		val htDeparture = new NullableStringFieldValue(self, ApDockRpt.fields.htDeparture)
-		val htReturn = new NullableStringFieldValue(self, ApDockRpt.fields.htReturn)
-		val fnName = new NullableStringFieldValue(self, ApDockRpt.fields.fnName)
-		val fnTime = new NullableStringFieldValue(self, ApDockRpt.fields.fnTime)
-		val fnStaffCovering = new NullableStringFieldValue(self, ApDockRpt.fields.fnStaffCovering)
-		val fnLocation = new NullableStringFieldValue(self, ApDockRpt.fields.fnLocation)
-		val fnAttendees = new NullableDoubleFieldValue(self, ApDockRpt.fields.fnAttendees)
-		val fnLiquor = new NullableBooleanFIeldValue(self, ApDockRpt.fields.fnLiquor)
-		val fnCaterer = new NullableStringFieldValue(self, ApDockRpt.fields.fnCaterer)
-		val drDate = new NullableLocalDateTimeFieldValue(self, ApDockRpt.fields.drDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRpt.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRpt.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRpt.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRpt.fields.updatedBy)
-	}
-}
-
-object ApDockRpt extends StorableObject[ApDockRpt] {
-	val entityName: String = "AP_DOCK_RPT"
-
-	object fields extends FieldsObject {
-		val drId = new IntDatabaseField(self, "DR_ID")
-		val mercSo = new NullableDoubleDatabaseField(self, "MERC_SO")
-		val kmSo = new NullableDoubleDatabaseField(self, "KM_SO")
-		val uapkmSo = new NullableDoubleDatabaseField(self, "UAPKM_SO")
-		val r19So = new NullableDoubleDatabaseField(self, "R19_SO")
-		val sonarSo = new NullableDoubleDatabaseField(self, "SONAR_SO")
-		val laserSo = new NullableDoubleDatabaseField(self, "LASER_SO")
-		val 420So = new NullableDoubleDatabaseField(self, "420_SO")
-		val wsSo = new NullableDoubleDatabaseField(self, "WS_SO")
-		val kayakSo = new NullableDoubleDatabaseField(self, "KAYAK_SO")
-		val supSo = new NullableDoubleDatabaseField(self, "SUP_SO")
-		val mercUsed = new NullableDoubleDatabaseField(self, "MERC_USED")
-		val kmUsed = new NullableDoubleDatabaseField(self, "KM_USED")
-		val uapkmUsed = new NullableDoubleDatabaseField(self, "UAPKM_USED")
-		val r19Used = new NullableDoubleDatabaseField(self, "R19_USED")
-		val sonarUsed = new NullableDoubleDatabaseField(self, "SONAR_USED")
-		val laserUsed = new NullableDoubleDatabaseField(self, "LASER_USED")
-		val 420Used = new NullableDoubleDatabaseField(self, "420_USED")
-		val wsUsed = new NullableDoubleDatabaseField(self, "WS_USED")
-		val kayakUsed = new NullableDoubleDatabaseField(self, "KAYAK_USED")
-		val supUsed = new NullableDoubleDatabaseField(self, "SUP_USED")
-		val mercUnavail = new NullableDoubleDatabaseField(self, "MERC_UNAVAIL")
-		val kmUnavail = new NullableDoubleDatabaseField(self, "KM_UNAVAIL")
-		val uapkmUnavail = new NullableDoubleDatabaseField(self, "UAPKM_UNAVAIL")
-		val r19Unavail = new NullableDoubleDatabaseField(self, "R19_UNAVAIL")
-		val sonarUnavail = new NullableDoubleDatabaseField(self, "SONAR_UNAVAIL")
-		val laserUnavail = new NullableDoubleDatabaseField(self, "LASER_UNAVAIL")
-		val 420Unavail = new NullableDoubleDatabaseField(self, "420_UNAVAIL")
-		val wsUnavail = new NullableDoubleDatabaseField(self, "WS_UNAVAIL")
-		val kayakUnavail = new NullableDoubleDatabaseField(self, "KAYAK_UNAVAIL")
-		val supUnavail = new NullableDoubleDatabaseField(self, "SUP_UNAVAIL")
-		val skippers = new NullableDoubleDatabaseField(self, "SKIPPERS")
-		val crew = new NullableDoubleDatabaseField(self, "CREW")
-		val over18Guests = new NullableDoubleDatabaseField(self, "OVER18_GUESTS")
-		val under18Guests = new NullableDoubleDatabaseField(self, "UNDER18_GUESTS")
-		val instructees = new NullableDoubleDatabaseField(self, "INSTRUCTEES")
-		val uapSailors = new NullableDoubleDatabaseField(self, "UAP_SAILORS")
-		val highSchools = new NullableDoubleDatabaseField(self, "HIGH_SCHOOLS")
-		val hsSailors = new NullableDoubleDatabaseField(self, "HS_SAILORS")
-		val runAgrounds = new NullableDoubleDatabaseField(self, "RUN_AGROUNDS")
-		val capsizes = new NullableDoubleDatabaseField(self, "CAPSIZES")
-		val maxWait = new NullableDoubleDatabaseField(self, "MAX_WAIT")
-		val 1daySails = new NullableDoubleDatabaseField(self, "1DAY_SAILS")
-		val 1dayKayaks = new NullableDoubleDatabaseField(self, "1DAY_KAYAKS")
-		val incidents = new NullableStringDatabaseField(self, "INCIDENTS", 4000)
-		val activities = new NullableStringDatabaseField(self, "ACTIVITIES", 4000)
-		val crwaFlag = new NullableStringDatabaseField(self, "CRWA_FLAG", 20)
-		val waterTemp = new NullableDoubleDatabaseField(self, "WATER_TEMP")
-		val htCaptain = new NullableStringDatabaseField(self, "HT_CAPTAIN", 200)
-		val htcCheckIn = new NullableStringDatabaseField(self, "HTC_CHECK_IN", 200)
-		val htcSailorRep = new NullableStringDatabaseField(self, "HTC_SAILOR_REP", 200)
-		val htSailors = new NullableDoubleDatabaseField(self, "HT_SAILORS")
-		val htBoats = new NullableDoubleDatabaseField(self, "HT_BOATS")
-		val htDestination = new NullableStringDatabaseField(self, "HT_DESTINATION", 50)
-		val htDeparture = new NullableStringDatabaseField(self, "HT_DEPARTURE", 10)
-		val htReturn = new NullableStringDatabaseField(self, "HT_RETURN", 10)
-		val fnName = new NullableStringDatabaseField(self, "FN_NAME", 200)
-		val fnTime = new NullableStringDatabaseField(self, "FN_TIME", 20)
-		val fnStaffCovering = new NullableStringDatabaseField(self, "FN_STAFF_COVERING", 100)
-		val fnLocation = new NullableStringDatabaseField(self, "FN_LOCATION", 100)
-		val fnAttendees = new NullableDoubleDatabaseField(self, "FN_ATTENDEES")
-		val fnLiquor = new NullableBooleanDatabaseField(self, "FN_LIQUOR")
-		val fnCaterer = new NullableStringDatabaseField(self, "FN_CATERER", 200)
-		val drDate = new NullableLocalDateTimeDatabaseField(self, "DR_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.drId
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRptClasse.scala b/entity-templates/ApDockRptClasse.scala
deleted file mode 100644
index de7c21a9..00000000
--- a/entity-templates/ApDockRptClasse.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRptClasse extends StorableClass(ApDockRptClasse) {
-	object values extends ValuesObject {
-		val drClassId = new IntFieldValue(self, ApDockRptClasse.fields.drClassId)
-		val classId = new NullableIntFieldValue(self, ApDockRptClasse.fields.classId)
-		val drId = new NullableIntFieldValue(self, ApDockRptClasse.fields.drId)
-		val classTime = new NullableStringFieldValue(self, ApDockRptClasse.fields.classTime)
-		val attendance = new NullableDoubleFieldValue(self, ApDockRptClasse.fields.attendance)
-		val instructor = new NullableStringFieldValue(self, ApDockRptClasse.fields.instructor)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRptClasse.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRptClasse.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRptClasse.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRptClasse.fields.updatedBy)
-	}
-}
-
-object ApDockRptClasse extends StorableObject[ApDockRptClasse] {
-	val entityName: String = "AP_DOCK_RPT_CLASSES"
-
-	object fields extends FieldsObject {
-		val drClassId = new IntDatabaseField(self, "DR_CLASS_ID")
-		val classId = new NullableIntDatabaseField(self, "CLASS_ID")
-		val drId = new NullableIntDatabaseField(self, "DR_ID")
-		val classTime = new NullableStringDatabaseField(self, "CLASS_TIME", 10)
-		val attendance = new NullableDoubleDatabaseField(self, "ATTENDANCE")
-		val instructor = new NullableStringDatabaseField(self, "INSTRUCTOR", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.drClassId
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRptClosure.scala b/entity-templates/ApDockRptClosure.scala
deleted file mode 100644
index c406d18c..00000000
--- a/entity-templates/ApDockRptClosure.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRptClosure extends StorableClass(ApDockRptClosure) {
-	object values extends ValuesObject {
-		val closureId = new IntFieldValue(self, ApDockRptClosure.fields.closureId)
-		val drId = new NullableIntFieldValue(self, ApDockRptClosure.fields.drId)
-		val closeTime = new NullableStringFieldValue(self, ApDockRptClosure.fields.closeTime)
-		val reopenTime = new NullableStringFieldValue(self, ApDockRptClosure.fields.reopenTime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRptClosure.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRptClosure.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRptClosure.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRptClosure.fields.updatedBy)
-	}
-}
-
-object ApDockRptClosure extends StorableObject[ApDockRptClosure] {
-	val entityName: String = "AP_DOCK_RPT_CLOSURES"
-
-	object fields extends FieldsObject {
-		val closureId = new IntDatabaseField(self, "CLOSURE_ID")
-		val drId = new NullableIntDatabaseField(self, "DR_ID")
-		val closeTime = new NullableStringDatabaseField(self, "CLOSE_TIME", 10)
-		val reopenTime = new NullableStringDatabaseField(self, "REOPEN_TIME", 10)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.closureId
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRptRating.scala b/entity-templates/ApDockRptRating.scala
deleted file mode 100644
index 872f0241..00000000
--- a/entity-templates/ApDockRptRating.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRptRating extends StorableClass(ApDockRptRating) {
-	object values extends ValuesObject {
-		val drRatingId = new IntFieldValue(self, ApDockRptRating.fields.drRatingId)
-		val drId = new NullableIntFieldValue(self, ApDockRptRating.fields.drId)
-		val ratingId = new NullableIntFieldValue(self, ApDockRptRating.fields.ratingId)
-		val ratingCt = new NullableDoubleFieldValue(self, ApDockRptRating.fields.ratingCt)
-		val numberTested = new NullableDoubleFieldValue(self, ApDockRptRating.fields.numberTested)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRptRating.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRptRating.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRptRating.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRptRating.fields.updatedBy)
-	}
-}
-
-object ApDockRptRating extends StorableObject[ApDockRptRating] {
-	val entityName: String = "AP_DOCK_RPT_RATINGS"
-
-	object fields extends FieldsObject {
-		val drRatingId = new IntDatabaseField(self, "DR_RATING_ID")
-		val drId = new NullableIntDatabaseField(self, "DR_ID")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-		val ratingCt = new NullableDoubleDatabaseField(self, "RATING_CT")
-		val numberTested = new NullableDoubleDatabaseField(self, "NUMBER_TESTED")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.drRatingId
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRptStaff.scala b/entity-templates/ApDockRptStaff.scala
deleted file mode 100644
index e5880b2c..00000000
--- a/entity-templates/ApDockRptStaff.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRptStaff extends StorableClass(ApDockRptStaff) {
-	object values extends ValuesObject {
-		val drStaffId = new IntFieldValue(self, ApDockRptStaff.fields.drStaffId)
-		val drId = new NullableIntFieldValue(self, ApDockRptStaff.fields.drId)
-		val name = new NullableStringFieldValue(self, ApDockRptStaff.fields.name)
-		val isDockmaster = new NullableBooleanFIeldValue(self, ApDockRptStaff.fields.isDockmaster)
-		val punchIn = new NullableStringFieldValue(self, ApDockRptStaff.fields.punchIn)
-		val punchOut = new NullableStringFieldValue(self, ApDockRptStaff.fields.punchOut)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRptStaff.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRptStaff.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRptStaff.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRptStaff.fields.updatedBy)
-	}
-}
-
-object ApDockRptStaff extends StorableObject[ApDockRptStaff] {
-	val entityName: String = "AP_DOCK_RPT_STAFF"
-
-	object fields extends FieldsObject {
-		val drStaffId = new IntDatabaseField(self, "DR_STAFF_ID")
-		val drId = new NullableIntDatabaseField(self, "DR_ID")
-		val name = new NullableStringDatabaseField(self, "NAME", 100)
-		val isDockmaster = new NullableBooleanDatabaseField(self, "IS_DOCKMASTER")
-		val punchIn = new NullableStringDatabaseField(self, "PUNCH_IN", 10)
-		val punchOut = new NullableStringDatabaseField(self, "PUNCH_OUT", 10)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.drStaffId
-}
\ No newline at end of file
diff --git a/entity-templates/ApDockRptWeather.scala b/entity-templates/ApDockRptWeather.scala
deleted file mode 100644
index a559fba3..00000000
--- a/entity-templates/ApDockRptWeather.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ApDockRptWeather extends StorableClass(ApDockRptWeather) {
-	object values extends ValuesObject {
-		val weatherId = new IntFieldValue(self, ApDockRptWeather.fields.weatherId)
-		val drId = new NullableIntFieldValue(self, ApDockRptWeather.fields.drId)
-		val time = new NullableStringFieldValue(self, ApDockRptWeather.fields.time)
-		val temp = new NullableDoubleFieldValue(self, ApDockRptWeather.fields.temp)
-		val weather = new NullableStringFieldValue(self, ApDockRptWeather.fields.weather)
-		val windDir = new NullableStringFieldValue(self, ApDockRptWeather.fields.windDir)
-		val windSteady = new NullableDoubleFieldValue(self, ApDockRptWeather.fields.windSteady)
-		val windGust = new NullableDoubleFieldValue(self, ApDockRptWeather.fields.windGust)
-		val flag = new NullableStringFieldValue(self, ApDockRptWeather.fields.flag)
-		val restrictions = new NullableStringFieldValue(self, ApDockRptWeather.fields.restrictions)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ApDockRptWeather.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ApDockRptWeather.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ApDockRptWeather.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ApDockRptWeather.fields.updatedBy)
-	}
-}
-
-object ApDockRptWeather extends StorableObject[ApDockRptWeather] {
-	val entityName: String = "AP_DOCK_RPT_WEATHER"
-
-	object fields extends FieldsObject {
-		val weatherId = new IntDatabaseField(self, "WEATHER_ID")
-		val drId = new NullableIntDatabaseField(self, "DR_ID")
-		val time = new NullableStringDatabaseField(self, "TIME", 10)
-		val temp = new NullableDoubleDatabaseField(self, "TEMP")
-		val weather = new NullableStringDatabaseField(self, "WEATHER", 50)
-		val windDir = new NullableStringDatabaseField(self, "WIND_DIR", 10)
-		val windSteady = new NullableDoubleDatabaseField(self, "WIND_STEADY")
-		val windGust = new NullableDoubleDatabaseField(self, "WIND_GUST")
-		val flag = new NullableStringDatabaseField(self, "FLAG", 20)
-		val restrictions = new NullableStringDatabaseField(self, "RESTRICTIONS", 4000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.weatherId
-}
\ No newline at end of file
diff --git a/entity-templates/AppIdIndex.scala b/entity-templates/AppIdIndex.scala
deleted file mode 100644
index 238cea2d..00000000
--- a/entity-templates/AppIdIndex.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class AppIdIndex extends StorableClass(AppIdIndex) {
-	object values extends ValuesObject {
-		val indexId = new IntFieldValue(self, AppIdIndex.fields.indexId)
-		val appAlias = new NullableStringFieldValue(self, AppIdIndex.fields.appAlias)
-		val appId = new NullableIntFieldValue(self, AppIdIndex.fields.appId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, AppIdIndex.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, AppIdIndex.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, AppIdIndex.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, AppIdIndex.fields.updatedBy)
-		val appName = new NullableStringFieldValue(self, AppIdIndex.fields.appName)
-	}
-}
-
-object AppIdIndex extends StorableObject[AppIdIndex] {
-	val entityName: String = "APP_ID_INDEX"
-
-	object fields extends FieldsObject {
-		val indexId = new IntDatabaseField(self, "INDEX_ID")
-		val appAlias = new NullableStringDatabaseField(self, "APP_ALIAS", 200)
-		val appId = new NullableIntDatabaseField(self, "APP_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val appName = new NullableStringDatabaseField(self, "APP_NAME", 100)
-	}
-
-	def primaryKey: IntDatabaseField = fields.indexId
-}
\ No newline at end of file
diff --git a/entity-templates/BoatType.scala b/entity-templates/BoatType.scala
deleted file mode 100644
index fc07acac..00000000
--- a/entity-templates/BoatType.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class BoatType extends StorableClass(BoatType) {
-	object values extends ValuesObject {
-		val boatId = new IntFieldValue(self, BoatType.fields.boatId)
-		val boatName = new NullableStringFieldValue(self, BoatType.fields.boatName)
-		val active = new NullableBooleanFIeldValue(self, BoatType.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, BoatType.fields.displayOrder)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, BoatType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, BoatType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, BoatType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, BoatType.fields.updatedBy)
-		val minCrew = new NullableDoubleFieldValue(self, BoatType.fields.minCrew)
-		val maxCrew = new NullableDoubleFieldValue(self, BoatType.fields.maxCrew)
-		val imageFilename = new NullableStringFieldValue(self, BoatType.fields.imageFilename)
-	}
-}
-
-object BoatType extends StorableObject[BoatType] {
-	val entityName: String = "BOAT_TYPES"
-
-	object fields extends FieldsObject {
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val boatName = new NullableStringDatabaseField(self, "BOAT_NAME", 50)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val minCrew = new NullableDoubleDatabaseField(self, "MIN_CREW")
-		val maxCrew = new NullableDoubleDatabaseField(self, "MAX_CREW")
-		val imageFilename = new NullableStringDatabaseField(self, "IMAGE_FILENAME", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.boatId
-}
\ No newline at end of file
diff --git a/entity-templates/BoatsRating.scala b/entity-templates/BoatsRating.scala
deleted file mode 100644
index ce109c3e..00000000
--- a/entity-templates/BoatsRating.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class BoatsRating extends StorableClass(BoatsRating) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, BoatsRating.fields.assignId)
-		val boatId = new NullableIntFieldValue(self, BoatsRating.fields.boatId)
-		val programId = new NullableIntFieldValue(self, BoatsRating.fields.programId)
-		val flag = new NullableBooleanFIeldValue(self, BoatsRating.fields.flag)
-		val ratingId = new NullableIntFieldValue(self, BoatsRating.fields.ratingId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, BoatsRating.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, BoatsRating.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, BoatsRating.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, BoatsRating.fields.updatedBy)
-	}
-}
-
-object BoatsRating extends StorableObject[BoatsRating] {
-	val entityName: String = "BOATS_RATINGS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val boatId = new NullableIntDatabaseField(self, "BOAT_ID")
-		val programId = new NullableIntDatabaseField(self, "PROGRAM_ID")
-		val flag = new NullableBooleanDatabaseField(self, "FLAG")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/BudgetItem.scala b/entity-templates/BudgetItem.scala
deleted file mode 100644
index 23d8c1f1..00000000
--- a/entity-templates/BudgetItem.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class BudgetItem extends StorableClass(BudgetItem) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, BudgetItem.fields.itemId)
-		val itemName = new StringFieldValue(self, BudgetItem.fields.itemName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, BudgetItem.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, BudgetItem.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, BudgetItem.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, BudgetItem.fields.updatedBy)
-		val displayOrder = new NullableDoubleFieldValue(self, BudgetItem.fields.displayOrder)
-	}
-}
-
-object BudgetItem extends StorableObject[BudgetItem] {
-	val entityName: String = "BUDGET_ITEMS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val itemName = new StringDatabaseField(self, "ITEM_NAME", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/CardDefinition.scala b/entity-templates/CardDefinition.scala
deleted file mode 100644
index 1c035d3f..00000000
--- a/entity-templates/CardDefinition.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CardDefinition extends StorableClass(CardDefinition) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, CardDefinition.fields.rowId)
-		val cardNumber = new NullableStringFieldValue(self, CardDefinition.fields.cardNumber)
-		val programId = new NullableIntFieldValue(self, CardDefinition.fields.programId)
-		val comments = new NullableStringFieldValue(self, CardDefinition.fields.comments)
-		val typeId = new NullableIntFieldValue(self, CardDefinition.fields.typeId)
-	}
-}
-
-object CardDefinition extends StorableObject[CardDefinition] {
-	val entityName: String = "CARD_DEFINITIONS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val cardNumber = new NullableStringDatabaseField(self, "CARD_NUMBER", 20)
-		val programId = new NullableIntDatabaseField(self, "PROGRAM_ID")
-		val comments = new NullableStringDatabaseField(self, "COMMENTS", 200)
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/CardDefinitionType.scala b/entity-templates/CardDefinitionType.scala
deleted file mode 100644
index 5dc7ba47..00000000
--- a/entity-templates/CardDefinitionType.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CardDefinitionType extends StorableClass(CardDefinitionType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, CardDefinitionType.fields.typeId)
-		val typeName = new NullableStringFieldValue(self, CardDefinitionType.fields.typeName)
-		val warnAt = new NullableDoubleFieldValue(self, CardDefinitionType.fields.warnAt)
-	}
-}
-
-object CardDefinitionType extends StorableObject[CardDefinitionType] {
-	val entityName: String = "CARD_DEFINITION_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new NullableStringDatabaseField(self, "TYPE_NAME", 100)
-		val warnAt = new NullableDoubleDatabaseField(self, "WARN_AT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/CardDismissal.scala b/entity-templates/CardDismissal.scala
deleted file mode 100644
index ef6a08f6..00000000
--- a/entity-templates/CardDismissal.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CardDismissal extends StorableClass(CardDismissal) {
-	object values extends ValuesObject {
-		val dismissalId = new IntFieldValue(self, CardDismissal.fields.dismissalId)
-		val cardAssignId = new NullableIntFieldValue(self, CardDismissal.fields.cardAssignId)
-		val season = new NullableDoubleFieldValue(self, CardDismissal.fields.season)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, CardDismissal.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, CardDismissal.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, CardDismissal.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, CardDismissal.fields.updatedBy)
-	}
-}
-
-object CardDismissal extends StorableObject[CardDismissal] {
-	val entityName: String = "CARD_DISMISSALS"
-
-	object fields extends FieldsObject {
-		val dismissalId = new IntDatabaseField(self, "DISMISSAL_ID")
-		val cardAssignId = new NullableIntDatabaseField(self, "CARD_ASSIGN_ID")
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.dismissalId
-}
\ No newline at end of file
diff --git a/entity-templates/CcErrorCode.scala b/entity-templates/CcErrorCode.scala
deleted file mode 100644
index f1d5fd9c..00000000
--- a/entity-templates/CcErrorCode.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CcErrorCode extends StorableClass(CcErrorCode) {
-	object values extends ValuesObject {
-		val errorId = new IntFieldValue(self, CcErrorCode.fields.errorId)
-		val errorCode = new NullableStringFieldValue(self, CcErrorCode.fields.errorCode)
-		val displayErrorMessage = new NullableStringFieldValue(self, CcErrorCode.fields.displayErrorMessage)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, CcErrorCode.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, CcErrorCode.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, CcErrorCode.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, CcErrorCode.fields.updatedBy)
-		val sageErrorMessage = new NullableStringFieldValue(self, CcErrorCode.fields.sageErrorMessage)
-		val errorTitle = new NullableStringFieldValue(self, CcErrorCode.fields.errorTitle)
-	}
-}
-
-object CcErrorCode extends StorableObject[CcErrorCode] {
-	val entityName: String = "CC_ERROR_CODES"
-
-	object fields extends FieldsObject {
-		val errorId = new IntDatabaseField(self, "ERROR_ID")
-		val errorCode = new NullableStringDatabaseField(self, "ERROR_CODE", 10)
-		val displayErrorMessage = new NullableStringDatabaseField(self, "DISPLAY_ERROR_MESSAGE", 4000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val sageErrorMessage = new NullableStringDatabaseField(self, "SAGE_ERROR_MESSAGE", 4000)
-		val errorTitle = new NullableStringDatabaseField(self, "ERROR_TITLE", 200)
-	}
-
-	def primaryKey: IntDatabaseField = fields.errorId
-}
\ No newline at end of file
diff --git a/entity-templates/CcLog.scala b/entity-templates/CcLog.scala
deleted file mode 100644
index e0f25468..00000000
--- a/entity-templates/CcLog.scala
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CcLog extends StorableClass(CcLog) {
-	object values extends ValuesObject {
-		val logId = new IntFieldValue(self, CcLog.fields.logId)
-		val logDatetime = new NullableLocalDateTimeFieldValue(self, CcLog.fields.logDatetime)
-		val cName = new NullableStringFieldValue(self, CcLog.fields.cName)
-		val cAddr = new NullableStringFieldValue(self, CcLog.fields.cAddr)
-		val cCity = new NullableStringFieldValue(self, CcLog.fields.cCity)
-		val cState = new NullableStringFieldValue(self, CcLog.fields.cState)
-		val cZip = new NullableStringFieldValue(self, CcLog.fields.cZip)
-		val cCountry = new NullableStringFieldValue(self, CcLog.fields.cCountry)
-		val cEmail = new NullableStringFieldValue(self, CcLog.fields.cEmail)
-		val cCardnumber = new NullableStringFieldValue(self, CcLog.fields.cCardnumber)
-		val cExp = new NullableStringFieldValue(self, CcLog.fields.cExp)
-		val tAmt = new NullableDoubleFieldValue(self, CcLog.fields.tAmt)
-		val tCode = new NullableStringFieldValue(self, CcLog.fields.tCode)
-		val tOrdernum = new NullableStringFieldValue(self, CcLog.fields.tOrdernum)
-		val tAuth = new NullableStringFieldValue(self, CcLog.fields.tAuth)
-		val tReference = new NullableStringFieldValue(self, CcLog.fields.tReference)
-		val response = new NullableStringFieldValue(self, CcLog.fields.response)
-		val rApprov = new NullableBooleanFIeldValue(self, CcLog.fields.rApprov)
-		val rCode = new NullableStringFieldValue(self, CcLog.fields.rCode)
-		val rMessage = new NullableStringFieldValue(self, CcLog.fields.rMessage)
-		val rCvv = new NullableBooleanFIeldValue(self, CcLog.fields.rCvv)
-		val rAvs = new NullableBooleanFIeldValue(self, CcLog.fields.rAvs)
-		val rRisk = new NullableStringFieldValue(self, CcLog.fields.rRisk)
-		val rReference = new NullableStringFieldValue(self, CcLog.fields.rReference)
-		val rOrdernumber = new NullableStringFieldValue(self, CcLog.fields.rOrdernumber)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, CcLog.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, CcLog.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, CcLog.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, CcLog.fields.updatedBy)
-	}
-}
-
-object CcLog extends StorableObject[CcLog] {
-	val entityName: String = "CC_LOG"
-
-	object fields extends FieldsObject {
-		val logId = new IntDatabaseField(self, "LOG_ID")
-		val logDatetime = new NullableLocalDateTimeDatabaseField(self, "LOG_DATETIME")
-		val cName = new NullableStringDatabaseField(self, "C_NAME", 500)
-		val cAddr = new NullableStringDatabaseField(self, "C_ADDR", 500)
-		val cCity = new NullableStringDatabaseField(self, "C_CITY", 50)
-		val cState = new NullableStringDatabaseField(self, "C_STATE", 50)
-		val cZip = new NullableStringDatabaseField(self, "C_ZIP", 10)
-		val cCountry = new NullableStringDatabaseField(self, "C_COUNTRY", 100)
-		val cEmail = new NullableStringDatabaseField(self, "C_EMAIL", 100)
-		val cCardnumber = new NullableStringDatabaseField(self, "C_CARDNUMBER", 30)
-		val cExp = new NullableStringDatabaseField(self, "C_EXP", 10)
-		val tAmt = new NullableDoubleDatabaseField(self, "T_AMT")
-		val tCode = new NullableStringDatabaseField(self, "T_CODE", 5)
-		val tOrdernum = new NullableStringDatabaseField(self, "T_ORDERNUM", 20)
-		val tAuth = new NullableStringDatabaseField(self, "T_AUTH", 50)
-		val tReference = new NullableStringDatabaseField(self, "T_REFERENCE", 50)
-		val response = new NullableStringDatabaseField(self, "RESPONSE", 200)
-		val rApprov = new NullableBooleanDatabaseField(self, "R_APPROV")
-		val rCode = new NullableStringDatabaseField(self, "R_CODE", 10)
-		val rMessage = new NullableStringDatabaseField(self, "R_MESSAGE", 50)
-		val rCvv = new NullableBooleanDatabaseField(self, "R_CVV")
-		val rAvs = new NullableBooleanDatabaseField(self, "R_AVS")
-		val rRisk = new NullableStringDatabaseField(self, "R_RISK", 50)
-		val rReference = new NullableStringDatabaseField(self, "R_REFERENCE", 100)
-		val rOrdernumber = new NullableStringDatabaseField(self, "R_ORDERNUMBER", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.logId
-}
\ No newline at end of file
diff --git a/entity-templates/CcTransNumber.scala b/entity-templates/CcTransNumber.scala
deleted file mode 100644
index ae0a5c9b..00000000
--- a/entity-templates/CcTransNumber.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CcTransNumber extends StorableClass(CcTransNumber) {
-	object values extends ValuesObject {
-		val closeId = new NullableIntFieldValue(self, CcTransNumber.fields.closeId)
-		val ccTransNum = new NullableDoubleFieldValue(self, CcTransNumber.fields.ccTransNum)
-		val nameLast = new NullableStringFieldValue(self, CcTransNumber.fields.nameLast)
-		val nameFirst = new NullableStringFieldValue(self, CcTransNumber.fields.nameFirst)
-		val itemName = new NullableStringFieldValue(self, CcTransNumber.fields.itemName)
-		val discount = new NullableStringFieldValue(self, CcTransNumber.fields.discount)
-		val price = new NullableDoubleFieldValue(self, CcTransNumber.fields.price)
-	}
-}
-
-object CcTransNumber extends StorableObject[CcTransNumber] {
-	val entityName: String = "CC_TRANS_NUMBERS"
-
-	object fields extends FieldsObject {
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val itemName = new NullableStringDatabaseField(self, "ITEM_NAME", 200)
-		val discount = new NullableStringDatabaseField(self, "DISCOUNT", 100)
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ClassInstructor.scala b/entity-templates/ClassInstructor.scala
deleted file mode 100644
index bb7f1ebe..00000000
--- a/entity-templates/ClassInstructor.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ClassInstructor extends StorableClass(ClassInstructor) {
-	object values extends ValuesObject {
-		val instructorId = new IntFieldValue(self, ClassInstructor.fields.instructorId)
-		val nameFirst = new NullableStringFieldValue(self, ClassInstructor.fields.nameFirst)
-		val nameLast = new NullableStringFieldValue(self, ClassInstructor.fields.nameLast)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ClassInstructor.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ClassInstructor.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ClassInstructor.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ClassInstructor.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, ClassInstructor.fields.active)
-	}
-}
-
-object ClassInstructor extends StorableObject[ClassInstructor] {
-	val entityName: String = "CLASS_INSTRUCTORS"
-
-	object fields extends FieldsObject {
-		val instructorId = new IntDatabaseField(self, "INSTRUCTOR_ID")
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.instructorId
-}
\ No newline at end of file
diff --git a/entity-templates/ClassLocation.scala b/entity-templates/ClassLocation.scala
deleted file mode 100644
index 0f540597..00000000
--- a/entity-templates/ClassLocation.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ClassLocation extends StorableClass(ClassLocation) {
-	object values extends ValuesObject {
-		val locationId = new IntFieldValue(self, ClassLocation.fields.locationId)
-		val locationName = new NullableStringFieldValue(self, ClassLocation.fields.locationName)
-		val active = new NullableBooleanFIeldValue(self, ClassLocation.fields.active)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ClassLocation.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ClassLocation.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ClassLocation.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ClassLocation.fields.updatedBy)
-	}
-}
-
-object ClassLocation extends StorableObject[ClassLocation] {
-	val entityName: String = "CLASS_LOCATIONS"
-
-	object fields extends FieldsObject {
-		val locationId = new IntDatabaseField(self, "LOCATION_ID")
-		val locationName = new NullableStringDatabaseField(self, "LOCATION_NAME", 100)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.locationId
-}
\ No newline at end of file
diff --git a/entity-templates/CloseArPayment.scala b/entity-templates/CloseArPayment.scala
deleted file mode 100644
index 3db53bee..00000000
--- a/entity-templates/CloseArPayment.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CloseArPayment extends StorableClass(CloseArPayment) {
-	object values extends ValuesObject {
-		val closeId = new NullableIntFieldValue(self, CloseArPayment.fields.closeId)
-		val amount = new NullableDoubleFieldValue(self, CloseArPayment.fields.amount)
-	}
-}
-
-object CloseArPayment extends StorableObject[CloseArPayment] {
-	val entityName: String = "CLOSE_AR_PAYMENTS"
-
-	object fields extends FieldsObject {
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val amount = new NullableDoubleDatabaseField(self, "AMOUNT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/CloseDescription.scala b/entity-templates/CloseDescription.scala
deleted file mode 100644
index b9292b4a..00000000
--- a/entity-templates/CloseDescription.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CloseDescription extends StorableClass(CloseDescription) {
-	object values extends ValuesObject {
-		val closeDescription = new NullableStringFieldValue(self, CloseDescription.fields.closeDescription)
-		val closeId = new IntFieldValue(self, CloseDescription.fields.closeId)
-	}
-}
-
-object CloseDescription extends StorableObject[CloseDescription] {
-	val entityName: String = "CLOSE_DESCRIPTIONS"
-
-	object fields extends FieldsObject {
-		val closeDescription = new NullableStringDatabaseField(self, "CLOSE_DESCRIPTION", 129)
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ClosePkgView.scala b/entity-templates/ClosePkgView.scala
deleted file mode 100644
index 777a856f..00000000
--- a/entity-templates/ClosePkgView.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ClosePkgView extends StorableClass(ClosePkgView) {
-	object values extends ValuesObject {
-		val closeId = new IntFieldValue(self, ClosePkgView.fields.closeId)
-		val getCashTotal = new NullableDoubleFieldValue(self, ClosePkgView.fields.getCashTotal)
-		val getInpersonArTotal = new NullableDoubleFieldValue(self, ClosePkgView.fields.getInpersonArTotal)
-		val getCheckTotal = new NullableDoubleFieldValue(self, ClosePkgView.fields.getCheckTotal)
-		val getInpersonTally = new NullableDoubleFieldValue(self, ClosePkgView.fields.getInpersonTally)
-		val getOnlineCcTotal = new NullableDoubleFieldValue(self, ClosePkgView.fields.getOnlineCcTotal)
-		val getOnlineAr = new NullableDoubleFieldValue(self, ClosePkgView.fields.getOnlineAr)
-		val getOnlineTally = new NullableDoubleFieldValue(self, ClosePkgView.fields.getOnlineTally)
-	}
-}
-
-object ClosePkgView extends StorableObject[ClosePkgView] {
-	val entityName: String = "CLOSE_PKG_VIEW"
-
-	object fields extends FieldsObject {
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val getCashTotal = new NullableDoubleDatabaseField(self, "GET_CASH_TOTAL")
-		val getInpersonArTotal = new NullableDoubleDatabaseField(self, "GET_INPERSON_AR_TOTAL")
-		val getCheckTotal = new NullableDoubleDatabaseField(self, "GET_CHECK_TOTAL")
-		val getInpersonTally = new NullableDoubleDatabaseField(self, "GET_INPERSON_TALLY")
-		val getOnlineCcTotal = new NullableDoubleDatabaseField(self, "GET_ONLINE_CC_TOTAL")
-		val getOnlineAr = new NullableDoubleDatabaseField(self, "GET_ONLINE_AR")
-		val getOnlineTally = new NullableDoubleDatabaseField(self, "GET_ONLINE_TALLY")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/CloseSummary.scala b/entity-templates/CloseSummary.scala
deleted file mode 100644
index a9c6ce52..00000000
--- a/entity-templates/CloseSummary.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CloseSummary extends StorableClass(CloseSummary) {
-	object values extends ValuesObject {
-		val showInSales = new NullableBooleanFIeldValue(self, CloseSummary.fields.showInSales)
-		val link = new NullableStringFieldValue(self, CloseSummary.fields.link)
-		val isRetail = new NullableStringFieldValue(self, CloseSummary.fields.isRetail)
-		val closeId = new NullableIntFieldValue(self, CloseSummary.fields.closeId)
-		val location = new NullableStringFieldValue(self, CloseSummary.fields.location)
-		val item = new NullableStringFieldValue(self, CloseSummary.fields.item)
-		val discount = new NullableStringFieldValue(self, CloseSummary.fields.discount)
-		val count = new NullableDoubleFieldValue(self, CloseSummary.fields.count)
-		val totalPrice = new NullableDoubleFieldValue(self, CloseSummary.fields.totalPrice)
-		val totalPretax = new NullableDoubleFieldValue(self, CloseSummary.fields.totalPretax)
-		val taxAmount = new NullableDoubleFieldValue(self, CloseSummary.fields.taxAmount)
-	}
-}
-
-object CloseSummary extends StorableObject[CloseSummary] {
-	val entityName: String = "CLOSE_SUMMARY"
-
-	object fields extends FieldsObject {
-		val showInSales = new NullableBooleanDatabaseField(self, "SHOW_IN_SALES")
-		val link = new NullableStringDatabaseField(self, "LINK", 217)
-		val isRetail = new NullableStringDatabaseField(self, "IS_RETAIL", 1)
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val location = new NullableStringDatabaseField(self, "LOCATION", 9)
-		val item = new NullableStringDatabaseField(self, "ITEM", 220)
-		val discount = new NullableStringDatabaseField(self, "DISCOUNT", 107)
-		val count = new NullableDoubleDatabaseField(self, "COUNT")
-		val totalPrice = new NullableDoubleDatabaseField(self, "TOTAL_PRICE")
-		val totalPretax = new NullableDoubleDatabaseField(self, "TOTAL_PRETAX")
-		val taxAmount = new NullableDoubleDatabaseField(self, "TAX_AMOUNT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/CommentsColumn.scala b/entity-templates/CommentsColumn.scala
deleted file mode 100644
index 63ae7c12..00000000
--- a/entity-templates/CommentsColumn.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CommentsColumn extends StorableClass(CommentsColumn) {
-	object values extends ValuesObject {
-		val columnName = new NullableStringFieldValue(self, CommentsColumn.fields.columnName)
-		val commentText = new NullableUnknownFieldType(self, CommentsColumn.fields.commentText)
-		val columnId = new IntFieldValue(self, CommentsColumn.fields.columnId)
-		val tableId = new IntFieldValue(self, CommentsColumn.fields.tableId)
-	}
-}
-
-object CommentsColumn extends StorableObject[CommentsColumn] {
-	val entityName: String = "COMMENTS_COLUMNS"
-
-	object fields extends FieldsObject {
-		val columnName = new NullableStringDatabaseField(self, "COLUMN_NAME", 50)
-		val commentText = new NullableUnknownFieldType(self, "COMMENT_TEXT")
-		val columnId = new IntDatabaseField(self, "COLUMN_ID")
-		val tableId = new IntDatabaseField(self, "TABLE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.columnId
-}
\ No newline at end of file
diff --git a/entity-templates/CommentsTable.scala b/entity-templates/CommentsTable.scala
deleted file mode 100644
index c00bdd4d..00000000
--- a/entity-templates/CommentsTable.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CommentsTable extends StorableClass(CommentsTable) {
-	object values extends ValuesObject {
-		val tableName = new NullableStringFieldValue(self, CommentsTable.fields.tableName)
-		val commentText = new NullableUnknownFieldType(self, CommentsTable.fields.commentText)
-		val tableId = new IntFieldValue(self, CommentsTable.fields.tableId)
-	}
-}
-
-object CommentsTable extends StorableObject[CommentsTable] {
-	val entityName: String = "COMMENTS_TABLES"
-
-	object fields extends FieldsObject {
-		val tableName = new NullableStringDatabaseField(self, "TABLE_NAME", 50)
-		val commentText = new NullableUnknownFieldType(self, "COMMENT_TEXT")
-		val tableId = new IntDatabaseField(self, "TABLE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.tableId
-}
\ No newline at end of file
diff --git a/entity-templates/ConstCont20140623.scala b/entity-templates/ConstCont20140623.scala
deleted file mode 100644
index e4ef30fe..00000000
--- a/entity-templates/ConstCont20140623.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ConstCont20140623 extends StorableClass(ConstCont20140623) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, ConstCont20140623.fields.id)
-		val firstName = new NullableStringFieldValue(self, ConstCont20140623.fields.firstName)
-		val lastName = new NullableStringFieldValue(self, ConstCont20140623.fields.lastName)
-		val company = new NullableStringFieldValue(self, ConstCont20140623.fields.company)
-		val jobTitle = new NullableStringFieldValue(self, ConstCont20140623.fields.jobTitle)
-		val emailAddressHome = new NullableStringFieldValue(self, ConstCont20140623.fields.emailAddressHome)
-		val emailAddressOther = new NullableStringFieldValue(self, ConstCont20140623.fields.emailAddressOther)
-		val streetAddressLine1Home = new NullableStringFieldValue(self, ConstCont20140623.fields.streetAddressLine1Home)
-		val cityHome = new NullableStringFieldValue(self, ConstCont20140623.fields.cityHome)
-		val stateprovinceHome = new NullableStringFieldValue(self, ConstCont20140623.fields.stateprovinceHome)
-		val zippostalCodeHome = new NullableStringFieldValue(self, ConstCont20140623.fields.zippostalCodeHome)
-		val countryHome = new NullableStringFieldValue(self, ConstCont20140623.fields.countryHome)
-		val streetAddressLine1Work = new NullableStringFieldValue(self, ConstCont20140623.fields.streetAddressLine1Work)
-		val cityWork = new NullableStringFieldValue(self, ConstCont20140623.fields.cityWork)
-		val stateprovinceWork = new NullableStringFieldValue(self, ConstCont20140623.fields.stateprovinceWork)
-		val zippostalCodeWork = new NullableStringFieldValue(self, ConstCont20140623.fields.zippostalCodeWork)
-		val countryWork = new NullableStringFieldValue(self, ConstCont20140623.fields.countryWork)
-		val customField1 = new NullableStringFieldValue(self, ConstCont20140623.fields.customField1)
-		val customField2 = new NullableStringFieldValue(self, ConstCont20140623.fields.customField2)
-		val customField3 = new NullableStringFieldValue(self, ConstCont20140623.fields.customField3)
-		val emailLists = new NullableStringFieldValue(self, ConstCont20140623.fields.emailLists)
-		val sourceName = new NullableStringFieldValue(self, ConstCont20140623.fields.sourceName)
-		val createdAt = new NullableStringFieldValue(self, ConstCont20140623.fields.createdAt)
-		val updatedAt = new NullableStringFieldValue(self, ConstCont20140623.fields.updatedAt)
-	}
-}
-
-object ConstCont20140623 extends StorableObject[ConstCont20140623] {
-	val entityName: String = "CONST_CONT_2014_06_23"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val firstName = new NullableStringDatabaseField(self, "FIRST_NAME", 100)
-		val lastName = new NullableStringDatabaseField(self, "LAST_NAME", 100)
-		val company = new NullableStringDatabaseField(self, "COMPANY", 100)
-		val jobTitle = new NullableStringDatabaseField(self, "JOB_TITLE", 100)
-		val emailAddressHome = new NullableStringDatabaseField(self, "EMAIL_ADDRESS___HOME", 500)
-		val emailAddressOther = new NullableStringDatabaseField(self, "EMAIL_ADDRESS___OTHER", 500)
-		val streetAddressLine1Home = new NullableStringDatabaseField(self, "STREET_ADDRESS_LINE_1___HOME", 500)
-		val cityHome = new NullableStringDatabaseField(self, "CITY___HOME", 50)
-		val stateprovinceHome = new NullableStringDatabaseField(self, "STATEPROVINCE___HOME", 50)
-		val zippostalCodeHome = new NullableStringDatabaseField(self, "ZIPPOSTAL_CODE___HOME", 50)
-		val countryHome = new NullableStringDatabaseField(self, "COUNTRY___HOME", 50)
-		val streetAddressLine1Work = new NullableStringDatabaseField(self, "STREET_ADDRESS_LINE_1___WORK", 50)
-		val cityWork = new NullableStringDatabaseField(self, "CITY___WORK", 50)
-		val stateprovinceWork = new NullableStringDatabaseField(self, "STATEPROVINCE___WORK", 50)
-		val zippostalCodeWork = new NullableStringDatabaseField(self, "ZIPPOSTAL_CODE___WORK", 50)
-		val countryWork = new NullableStringDatabaseField(self, "COUNTRY___WORK", 50)
-		val customField1 = new NullableStringDatabaseField(self, "CUSTOM_FIELD_1", 500)
-		val customField2 = new NullableStringDatabaseField(self, "CUSTOM_FIELD_2", 50)
-		val customField3 = new NullableStringDatabaseField(self, "CUSTOM_FIELD_3", 50)
-		val emailLists = new NullableStringDatabaseField(self, "EMAIL_LISTS", 500)
-		val sourceName = new NullableStringDatabaseField(self, "SOURCE_NAME", 100)
-		val createdAt = new NullableStringDatabaseField(self, "CREATED_AT", 30)
-		val updatedAt = new NullableStringDatabaseField(self, "UPDATED_AT", 30)
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/CorpAttend2013.scala b/entity-templates/CorpAttend2013.scala
deleted file mode 100644
index c711ae22..00000000
--- a/entity-templates/CorpAttend2013.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CorpAttend2013 extends StorableClass(CorpAttend2013) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, CorpAttend2013.fields.id)
-		val name = new NullableStringFieldValue(self, CorpAttend2013.fields.name)
-		val personId = new NullableIntFieldValue(self, CorpAttend2013.fields.personId)
-	}
-}
-
-object CorpAttend2013 extends StorableObject[CorpAttend2013] {
-	val entityName: String = "CORP_ATTEND_2013"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val name = new NullableStringDatabaseField(self, "NAME", 30)
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/Countrie.scala b/entity-templates/Countrie.scala
deleted file mode 100644
index 3c034dd3..00000000
--- a/entity-templates/Countrie.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Countrie extends StorableClass(Countrie) {
-	object values extends ValuesObject {
-		val countryId = new IntFieldValue(self, Countrie.fields.countryId)
-		val abbrev = new NullableStringFieldValue(self, Countrie.fields.abbrev)
-		val countryName = new NullableStringFieldValue(self, Countrie.fields.countryName)
-	}
-}
-
-object Countrie extends StorableObject[Countrie] {
-	val entityName: String = "COUNTRIES"
-
-	object fields extends FieldsObject {
-		val countryId = new IntDatabaseField(self, "COUNTRY_ID")
-		val abbrev = new NullableStringDatabaseField(self, "ABBREV", 30)
-		val countryName = new NullableStringDatabaseField(self, "COUNTRY_NAME", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.countryId
-}
\ No newline at end of file
diff --git a/entity-templates/CriticalError.scala b/entity-templates/CriticalError.scala
deleted file mode 100644
index 2cc258df..00000000
--- a/entity-templates/CriticalError.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CriticalError extends StorableClass(CriticalError) {
-	object values extends ValuesObject {
-		val errorText = new NullableStringFieldValue(self, CriticalError.fields.errorText)
-		val isMinor = new NullableBooleanFIeldValue(self, CriticalError.fields.isMinor)
-	}
-}
-
-object CriticalError extends StorableObject[CriticalError] {
-	val entityName: String = "CRITICAL_ERRORS"
-
-	object fields extends FieldsObject {
-		val errorText = new NullableStringDatabaseField(self, "ERROR_TEXT", 4000)
-		val isMinor = new NullableBooleanDatabaseField(self, "IS_MINOR")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/CurrentClose.scala b/entity-templates/CurrentClose.scala
deleted file mode 100644
index 4162b6f1..00000000
--- a/entity-templates/CurrentClose.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class CurrentClose extends StorableClass(CurrentClose) {
-	object values extends ValuesObject {
-		val inpersonClose = new DoubleFieldValue(self, CurrentClose.fields.inpersonClose)
-		val onlineClose = new DoubleFieldValue(self, CurrentClose.fields.onlineClose)
-	}
-}
-
-object CurrentClose extends StorableObject[CurrentClose] {
-	val entityName: String = "CURRENT_CLOSES"
-
-	object fields extends FieldsObject {
-		val inpersonClose = new DoubleDatabaseField(self, "INPERSON_CLOSE")
-		val onlineClose = new DoubleDatabaseField(self, "ONLINE_CLOSE")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/DamageWaiver.scala b/entity-templates/DamageWaiver.scala
deleted file mode 100644
index 3d829ba6..00000000
--- a/entity-templates/DamageWaiver.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DamageWaiver extends StorableClass(DamageWaiver) {
-	object values extends ValuesObject {
-		val waiverId = new IntFieldValue(self, DamageWaiver.fields.waiverId)
-		val personId = new IntFieldValue(self, DamageWaiver.fields.personId)
-		val orderId = new NullableIntFieldValue(self, DamageWaiver.fields.orderId)
-		val price = new NullableDoubleFieldValue(self, DamageWaiver.fields.price)
-		val purchaseDate = new NullableLocalDateTimeFieldValue(self, DamageWaiver.fields.purchaseDate)
-		val startDate = new NullableLocalDateTimeFieldValue(self, DamageWaiver.fields.startDate)
-		val expirationDate = new NullableLocalDateTimeFieldValue(self, DamageWaiver.fields.expirationDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DamageWaiver.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DamageWaiver.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DamageWaiver.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DamageWaiver.fields.updatedBy)
-		val closeId = new NullableIntFieldValue(self, DamageWaiver.fields.closeId)
-		val paymentLocation = new NullableStringFieldValue(self, DamageWaiver.fields.paymentLocation)
-		val paymentMedium = new NullableStringFieldValue(self, DamageWaiver.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, DamageWaiver.fields.ccTransNum)
-		val voidCloseId = new NullableIntFieldValue(self, DamageWaiver.fields.voidCloseId)
-	}
-}
-
-object DamageWaiver extends StorableObject[DamageWaiver] {
-	val entityName: String = "DAMAGE_WAIVERS"
-
-	object fields extends FieldsObject {
-		val waiverId = new IntDatabaseField(self, "WAIVER_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val purchaseDate = new NullableLocalDateTimeDatabaseField(self, "PURCHASE_DATE")
-		val startDate = new NullableLocalDateTimeDatabaseField(self, "START_DATE")
-		val expirationDate = new NullableLocalDateTimeDatabaseField(self, "EXPIRATION_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val paymentLocation = new NullableStringDatabaseField(self, "PAYMENT_LOCATION", 100)
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 100)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.waiverId
-}
\ No newline at end of file
diff --git a/entity-templates/DatesWithSeason.scala b/entity-templates/DatesWithSeason.scala
deleted file mode 100644
index 7b58de76..00000000
--- a/entity-templates/DatesWithSeason.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DatesWithSeason extends StorableClass(DatesWithSeason) {
-	object values extends ValuesObject {
-		val datecol = new NullableLocalDateTimeFieldValue(self, DatesWithSeason.fields.datecol)
-		val season = new NullableDoubleFieldValue(self, DatesWithSeason.fields.season)
-	}
-}
-
-object DatesWithSeason extends StorableObject[DatesWithSeason] {
-	val entityName: String = "DATES_WITH_SEASONS"
-
-	object fields extends FieldsObject {
-		val datecol = new NullableLocalDateTimeDatabaseField(self, "DATECOL")
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/DeveloperSession.scala b/entity-templates/DeveloperSession.scala
deleted file mode 100644
index e21d42f8..00000000
--- a/entity-templates/DeveloperSession.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DeveloperSession extends StorableClass(DeveloperSession) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, DeveloperSession.fields.rowId)
-		val userName = new StringFieldValue(self, DeveloperSession.fields.userName)
-		val sessionId = new IntFieldValue(self, DeveloperSession.fields.sessionId)
-		val viewDate = new LocalDateTimeFieldValue(self, DeveloperSession.fields.viewDate)
-	}
-}
-
-object DeveloperSession extends StorableObject[DeveloperSession] {
-	val entityName: String = "DEVELOPER_SESSIONS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val userName = new StringDatabaseField(self, "USER_NAME", 50)
-		val sessionId = new IntDatabaseField(self, "SESSION_ID")
-		val viewDate = new LocalDateTimeDatabaseField(self, "VIEW_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/DhGlobal.scala b/entity-templates/DhGlobal.scala
deleted file mode 100644
index de529716..00000000
--- a/entity-templates/DhGlobal.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DhGlobal extends StorableClass(DhGlobal) {
-	object values extends ValuesObject {
-		val globalId = new IntFieldValue(self, DhGlobal.fields.globalId)
-		val description = new NullableStringFieldValue(self, DhGlobal.fields.description)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DhGlobal.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DhGlobal.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DhGlobal.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DhGlobal.fields.updatedBy)
-		val alias = new NullableStringFieldValue(self, DhGlobal.fields.alias)
-	}
-}
-
-object DhGlobal extends StorableObject[DhGlobal] {
-	val entityName: String = "DH_GLOBALS"
-
-	object fields extends FieldsObject {
-		val globalId = new IntDatabaseField(self, "GLOBAL_ID")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 4000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val alias = new NullableStringDatabaseField(self, "ALIAS", 20)
-	}
-
-	def primaryKey: IntDatabaseField = fields.globalId
-}
\ No newline at end of file
diff --git a/entity-templates/Discount.scala b/entity-templates/Discount.scala
deleted file mode 100644
index abb89b8e..00000000
--- a/entity-templates/Discount.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Discount extends StorableClass(Discount) {
-	object values extends ValuesObject {
-		val discountId = new IntFieldValue(self, Discount.fields.discountId)
-		val categoryId = new NullableIntFieldValue(self, Discount.fields.categoryId)
-		val discountName = new NullableStringFieldValue(self, Discount.fields.discountName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Discount.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Discount.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Discount.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Discount.fields.updatedBy)
-		val alertOnClose = new NullableBooleanFIeldValue(self, Discount.fields.alertOnClose)
-	}
-}
-
-object Discount extends StorableObject[Discount] {
-	val entityName: String = "DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val discountId = new IntDatabaseField(self, "DISCOUNT_ID")
-		val categoryId = new NullableIntDatabaseField(self, "CATEGORY_ID")
-		val discountName = new NullableStringDatabaseField(self, "DISCOUNT_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val alertOnClose = new NullableBooleanDatabaseField(self, "ALERT_ON_CLOSE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.discountId
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountActiveInstance.scala b/entity-templates/DiscountActiveInstance.scala
deleted file mode 100644
index e5f68e4e..00000000
--- a/entity-templates/DiscountActiveInstance.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountActiveInstance extends StorableClass(DiscountActiveInstance) {
-	object values extends ValuesObject {
-		val discountId = new IntFieldValue(self, DiscountActiveInstance.fields.discountId)
-		val instanceId = new NullableIntFieldValue(self, DiscountActiveInstance.fields.instanceId)
-	}
-}
-
-object DiscountActiveInstance extends StorableObject[DiscountActiveInstance] {
-	val entityName: String = "DISCOUNT_ACTIVE_INSTANCES"
-
-	object fields extends FieldsObject {
-		val discountId = new IntDatabaseField(self, "DISCOUNT_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountCategorie.scala b/entity-templates/DiscountCategorie.scala
deleted file mode 100644
index 5ff8d869..00000000
--- a/entity-templates/DiscountCategorie.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountCategorie extends StorableClass(DiscountCategorie) {
-	object values extends ValuesObject {
-		val categoryId = new IntFieldValue(self, DiscountCategorie.fields.categoryId)
-		val categoryName = new NullableStringFieldValue(self, DiscountCategorie.fields.categoryName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DiscountCategorie.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DiscountCategorie.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DiscountCategorie.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DiscountCategorie.fields.updatedBy)
-	}
-}
-
-object DiscountCategorie extends StorableObject[DiscountCategorie] {
-	val entityName: String = "DISCOUNT_CATEGORIES"
-
-	object fields extends FieldsObject {
-		val categoryId = new IntDatabaseField(self, "CATEGORY_ID")
-		val categoryName = new NullableStringDatabaseField(self, "CATEGORY_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.categoryId
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountCode.scala b/entity-templates/DiscountCode.scala
deleted file mode 100644
index 1c73bb3d..00000000
--- a/entity-templates/DiscountCode.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountCode extends StorableClass(DiscountCode) {
-	object values extends ValuesObject {
-		val codeId = new IntFieldValue(self, DiscountCode.fields.codeId)
-		val email = new StringFieldValue(self, DiscountCode.fields.email)
-		val discountId = new IntFieldValue(self, DiscountCode.fields.discountId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DiscountCode.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DiscountCode.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DiscountCode.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DiscountCode.fields.updatedBy)
-		val code = new StringFieldValue(self, DiscountCode.fields.code)
-		val name = new NullableStringFieldValue(self, DiscountCode.fields.name)
-	}
-}
-
-object DiscountCode extends StorableObject[DiscountCode] {
-	val entityName: String = "DISCOUNT_CODES"
-
-	object fields extends FieldsObject {
-		val codeId = new IntDatabaseField(self, "CODE_ID")
-		val email = new StringDatabaseField(self, "EMAIL", 500)
-		val discountId = new IntDatabaseField(self, "DISCOUNT_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val code = new StringDatabaseField(self, "CODE", 50)
-		val name = new NullableStringDatabaseField(self, "NAME", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.codeId
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountInstance.scala b/entity-templates/DiscountInstance.scala
deleted file mode 100644
index a1f05fed..00000000
--- a/entity-templates/DiscountInstance.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountInstance extends StorableClass(DiscountInstance) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, DiscountInstance.fields.instanceId)
-		val discountId = new NullableIntFieldValue(self, DiscountInstance.fields.discountId)
-		val nameOverride = new NullableStringFieldValue(self, DiscountInstance.fields.nameOverride)
-		val startActive = new NullableLocalDateTimeFieldValue(self, DiscountInstance.fields.startActive)
-		val endActive = new NullableLocalDateTimeFieldValue(self, DiscountInstance.fields.endActive)
-		val universalCode = new NullableStringFieldValue(self, DiscountInstance.fields.universalCode)
-		val isCaseSensitive = new NullableBooleanFIeldValue(self, DiscountInstance.fields.isCaseSensitive)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DiscountInstance.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DiscountInstance.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DiscountInstance.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DiscountInstance.fields.updatedBy)
-		val emailRegexp = new NullableStringFieldValue(self, DiscountInstance.fields.emailRegexp)
-	}
-}
-
-object DiscountInstance extends StorableObject[DiscountInstance] {
-	val entityName: String = "DISCOUNT_INSTANCES"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val discountId = new NullableIntDatabaseField(self, "DISCOUNT_ID")
-		val nameOverride = new NullableStringDatabaseField(self, "NAME_OVERRIDE", 100)
-		val startActive = new NullableLocalDateTimeDatabaseField(self, "START_ACTIVE")
-		val endActive = new NullableLocalDateTimeDatabaseField(self, "END_ACTIVE")
-		val universalCode = new NullableStringDatabaseField(self, "UNIVERSAL_CODE", 100)
-		val isCaseSensitive = new NullableBooleanDatabaseField(self, "IS_CASE_SENSITIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val emailRegexp = new NullableStringDatabaseField(self, "EMAIL_REGEXP", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.instanceId
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountInstanceLevel.scala b/entity-templates/DiscountInstanceLevel.scala
deleted file mode 100644
index fdc9f7e6..00000000
--- a/entity-templates/DiscountInstanceLevel.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountInstanceLevel extends StorableClass(DiscountInstanceLevel) {
-	object values extends ValuesObject {
-		val levelId = new IntFieldValue(self, DiscountInstanceLevel.fields.levelId)
-		val instanceId = new NullableIntFieldValue(self, DiscountInstanceLevel.fields.instanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, DiscountInstanceLevel.fields.discountAmt)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DiscountInstanceLevel.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DiscountInstanceLevel.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DiscountInstanceLevel.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DiscountInstanceLevel.fields.updatedBy)
-	}
-}
-
-object DiscountInstanceLevel extends StorableObject[DiscountInstanceLevel] {
-	val entityName: String = "DISCOUNT_INSTANCE_LEVELS"
-
-	object fields extends FieldsObject {
-		val levelId = new IntDatabaseField(self, "LEVEL_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.levelId
-}
\ No newline at end of file
diff --git a/entity-templates/DiscountMapping.scala b/entity-templates/DiscountMapping.scala
deleted file mode 100644
index 5724585c..00000000
--- a/entity-templates/DiscountMapping.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DiscountMapping extends StorableClass(DiscountMapping) {
-	object values extends ValuesObject {
-		val oldDiscountId = new IntFieldValue(self, DiscountMapping.fields.oldDiscountId)
-		val instanceId = new NullableIntFieldValue(self, DiscountMapping.fields.instanceId)
-	}
-}
-
-object DiscountMapping extends StorableObject[DiscountMapping] {
-	val entityName: String = "DISCOUNT_MAPPING"
-
-	object fields extends FieldsObject {
-		val oldDiscountId = new IntDatabaseField(self, "OLD_DISCOUNT_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.oldDiscountId
-}
\ No newline at end of file
diff --git a/entity-templates/Donation.scala b/entity-templates/Donation.scala
deleted file mode 100644
index c4d00e9f..00000000
--- a/entity-templates/Donation.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Donation extends StorableClass(Donation) {
-	object values extends ValuesObject {
-		val donationId = new IntFieldValue(self, Donation.fields.donationId)
-		val personId = new NullableIntFieldValue(self, Donation.fields.personId)
-		val addressLine = new NullableStringFieldValue(self, Donation.fields.addressLine)
-		val amount = new NullableDoubleFieldValue(self, Donation.fields.amount)
-		val description = new NullableStringFieldValue(self, Donation.fields.description)
-		val donationDate = new NullableLocalDateTimeFieldValue(self, Donation.fields.donationDate)
-		val inKind = new NullableBooleanFIeldValue(self, Donation.fields.inKind)
-		val restriction = new NullableStringFieldValue(self, Donation.fields.restriction)
-		val salutation = new NullableStringFieldValue(self, Donation.fields.salutation)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Donation.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Donation.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Donation.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Donation.fields.updatedBy)
-		val orderId = new NullableIntFieldValue(self, Donation.fields.orderId)
-		val fundId = new IntFieldValue(self, Donation.fields.fundId)
-		val initiativeId = new IntFieldValue(self, Donation.fields.initiativeId)
-		val closeId = new NullableIntFieldValue(self, Donation.fields.closeId)
-		val paymentLocation = new NullableStringFieldValue(self, Donation.fields.paymentLocation)
-		val paymentMedium = new NullableStringFieldValue(self, Donation.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, Donation.fields.ccTransNum)
-		val voidCloseId = new NullableIntFieldValue(self, Donation.fields.voidCloseId)
-		val noAck = new NullableBooleanFIeldValue(self, Donation.fields.noAck)
-		val inMemoryOf = new NullableStringFieldValue(self, Donation.fields.inMemoryOf)
-		val isMatch = new NullableBooleanFIeldValue(self, Donation.fields.isMatch)
-		val skipAck = new NullableBooleanFIeldValue(self, Donation.fields.skipAck)
-	}
-}
-
-object Donation extends StorableObject[Donation] {
-	val entityName: String = "DONATIONS"
-
-	object fields extends FieldsObject {
-		val donationId = new IntDatabaseField(self, "DONATION_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val addressLine = new NullableStringDatabaseField(self, "ADDRESS_LINE", 200)
-		val amount = new NullableDoubleDatabaseField(self, "AMOUNT")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 500)
-		val donationDate = new NullableLocalDateTimeDatabaseField(self, "DONATION_DATE")
-		val inKind = new NullableBooleanDatabaseField(self, "IN_KIND")
-		val restriction = new NullableStringDatabaseField(self, "RESTRICTION", 200)
-		val salutation = new NullableStringDatabaseField(self, "SALUTATION", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val fundId = new IntDatabaseField(self, "FUND_ID")
-		val initiativeId = new IntDatabaseField(self, "INITIATIVE_ID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val paymentLocation = new NullableStringDatabaseField(self, "PAYMENT_LOCATION", 100)
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 100)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val noAck = new NullableBooleanDatabaseField(self, "NO_ACK")
-		val inMemoryOf = new NullableStringDatabaseField(self, "IN_MEMORY_OF", 500)
-		val isMatch = new NullableBooleanDatabaseField(self, "IS_MATCH")
-		val skipAck = new NullableBooleanDatabaseField(self, "SKIP_ACK")
-	}
-
-	def primaryKey: IntDatabaseField = fields.donationId
-}
\ No newline at end of file
diff --git a/entity-templates/DonationFund.scala b/entity-templates/DonationFund.scala
deleted file mode 100644
index db97acc8..00000000
--- a/entity-templates/DonationFund.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DonationFund extends StorableClass(DonationFund) {
-	object values extends ValuesObject {
-		val fundId = new IntFieldValue(self, DonationFund.fields.fundId)
-		val fundName = new NullableStringFieldValue(self, DonationFund.fields.fundName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DonationFund.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DonationFund.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DonationFund.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DonationFund.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, DonationFund.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, DonationFund.fields.displayOrder)
-		val letterText = new NullableStringFieldValue(self, DonationFund.fields.letterText)
-		val showInCheckout = new NullableBooleanFIeldValue(self, DonationFund.fields.showInCheckout)
-		val portalDescription = new NullableStringFieldValue(self, DonationFund.fields.portalDescription)
-		val isEndowment = new NullableBooleanFIeldValue(self, DonationFund.fields.isEndowment)
-	}
-}
-
-object DonationFund extends StorableObject[DonationFund] {
-	val entityName: String = "DONATION_FUNDS"
-
-	object fields extends FieldsObject {
-		val fundId = new IntDatabaseField(self, "FUND_ID")
-		val fundName = new NullableStringDatabaseField(self, "FUND_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val letterText = new NullableStringDatabaseField(self, "LETTER_TEXT", 500)
-		val showInCheckout = new NullableBooleanDatabaseField(self, "SHOW_IN_CHECKOUT")
-		val portalDescription = new NullableStringDatabaseField(self, "PORTAL_DESCRIPTION", 2000)
-		val isEndowment = new NullableBooleanDatabaseField(self, "IS_ENDOWMENT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.fundId
-}
\ No newline at end of file
diff --git a/entity-templates/DonationInitiative.scala b/entity-templates/DonationInitiative.scala
deleted file mode 100644
index 52b07cab..00000000
--- a/entity-templates/DonationInitiative.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DonationInitiative extends StorableClass(DonationInitiative) {
-	object values extends ValuesObject {
-		val initiativeId = new IntFieldValue(self, DonationInitiative.fields.initiativeId)
-		val initiativeName = new NullableStringFieldValue(self, DonationInitiative.fields.initiativeName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DonationInitiative.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DonationInitiative.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DonationInitiative.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DonationInitiative.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, DonationInitiative.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, DonationInitiative.fields.displayOrder)
-	}
-}
-
-object DonationInitiative extends StorableObject[DonationInitiative] {
-	val entityName: String = "DONATION_INITIATIVES"
-
-	object fields extends FieldsObject {
-		val initiativeId = new IntDatabaseField(self, "INITIATIVE_ID")
-		val initiativeName = new NullableStringDatabaseField(self, "INITIATIVE_NAME", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.initiativeId
-}
\ No newline at end of file
diff --git a/entity-templates/DonationSuggestion.scala b/entity-templates/DonationSuggestion.scala
deleted file mode 100644
index 5529f0c1..00000000
--- a/entity-templates/DonationSuggestion.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class DonationSuggestion extends StorableClass(DonationSuggestion) {
-	object values extends ValuesObject {
-		val suggId = new IntFieldValue(self, DonationSuggestion.fields.suggId)
-		val amount = new NullableDoubleFieldValue(self, DonationSuggestion.fields.amount)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, DonationSuggestion.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, DonationSuggestion.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, DonationSuggestion.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, DonationSuggestion.fields.updatedBy)
-	}
-}
-
-object DonationSuggestion extends StorableObject[DonationSuggestion] {
-	val entityName: String = "DONATION_SUGGESTIONS"
-
-	object fields extends FieldsObject {
-		val suggId = new IntDatabaseField(self, "SUGG_ID")
-		val amount = new NullableDoubleDatabaseField(self, "AMOUNT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.suggId
-}
\ No newline at end of file
diff --git a/entity-templates/Eii.scala b/entity-templates/Eii.scala
deleted file mode 100644
index af29fea6..00000000
--- a/entity-templates/Eii.scala
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Eii extends StorableClass(Eii) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, Eii.fields.id)
-		val desc7 = new NullableStringFieldValue(self, Eii.fields.desc7)
-		val desc6 = new NullableStringFieldValue(self, Eii.fields.desc6)
-		val desc5 = new NullableStringFieldValue(self, Eii.fields.desc5)
-		val desc4 = new NullableStringFieldValue(self, Eii.fields.desc4)
-		val desc3 = new NullableStringFieldValue(self, Eii.fields.desc3)
-		val desc2 = new NullableStringFieldValue(self, Eii.fields.desc2)
-		val desc1 = new NullableStringFieldValue(self, Eii.fields.desc1)
-		val housing = new NullableDoubleFieldValue(self, Eii.fields.housing)
-		val utilities = new NullableDoubleFieldValue(self, Eii.fields.utilities)
-		val food = new NullableDoubleFieldValue(self, Eii.fields.food)
-		val transportation = new NullableDoubleFieldValue(self, Eii.fields.transportation)
-		val childCare = new NullableDoubleFieldValue(self, Eii.fields.childCare)
-		val personalHouseholdNeeds = new NullableDoubleFieldValue(self, Eii.fields.personalHouseholdNeeds)
-		val healthcare = new NullableDoubleFieldValue(self, Eii.fields.healthcare)
-		val taxes = new NullableDoubleFieldValue(self, Eii.fields.taxes)
-		val taxCredits = new NullableDoubleFieldValue(self, Eii.fields.taxCredits)
-		val monthlyTotal = new NullableDoubleFieldValue(self, Eii.fields.monthlyTotal)
-		val annualTotal = new NullableDoubleFieldValue(self, Eii.fields.annualTotal)
-		val hourlyWage = new NullableDoubleFieldValue(self, Eii.fields.hourlyWage)
-		val precautionary = new NullableDoubleFieldValue(self, Eii.fields.precautionary)
-		val retirement = new NullableDoubleFieldValue(self, Eii.fields.retirement)
-		val childrensEducationTraining = new NullableDoubleFieldValue(self, Eii.fields.childrensEducationTraining)
-		val homeownership = new NullableDoubleFieldValue(self, Eii.fields.homeownership)
-		val benefits = new NullableStringFieldValue(self, Eii.fields.benefits)
-		val monthlyTotalTemp = new NullableStringFieldValue(self, Eii.fields.monthlyTotalTemp)
-		val annualTotalTemp = new NullableStringFieldValue(self, Eii.fields.annualTotalTemp)
-		val workerCt = new NullableDoubleFieldValue(self, Eii.fields.workerCt)
-		val infantCt = new NullableDoubleFieldValue(self, Eii.fields.infantCt)
-		val preschoolerCt = new NullableDoubleFieldValue(self, Eii.fields.preschoolerCt)
-		val schoolageCt = new NullableDoubleFieldValue(self, Eii.fields.schoolageCt)
-		val teenageCt = new NullableDoubleFieldValue(self, Eii.fields.teenageCt)
-	}
-}
-
-object Eii extends StorableObject[Eii] {
-	val entityName: String = "EII"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val desc7 = new NullableStringDatabaseField(self, "DESC_7", 30)
-		val desc6 = new NullableStringDatabaseField(self, "DESC_6", 30)
-		val desc5 = new NullableStringDatabaseField(self, "DESC_5", 30)
-		val desc4 = new NullableStringDatabaseField(self, "DESC_4", 30)
-		val desc3 = new NullableStringDatabaseField(self, "DESC_3", 30)
-		val desc2 = new NullableStringDatabaseField(self, "DESC_2", 30)
-		val desc1 = new NullableStringDatabaseField(self, "DESC_1", 30)
-		val housing = new NullableDoubleDatabaseField(self, "HOUSING")
-		val utilities = new NullableDoubleDatabaseField(self, "UTILITIES")
-		val food = new NullableDoubleDatabaseField(self, "FOOD")
-		val transportation = new NullableDoubleDatabaseField(self, "TRANSPORTATION")
-		val childCare = new NullableDoubleDatabaseField(self, "CHILD_CARE")
-		val personalHouseholdNeeds = new NullableDoubleDatabaseField(self, "PERSONAL_HOUSEHOLD_NEEDS")
-		val healthcare = new NullableDoubleDatabaseField(self, "HEALTHCARE")
-		val taxes = new NullableDoubleDatabaseField(self, "TAXES")
-		val taxCredits = new NullableDoubleDatabaseField(self, "TAX_CREDITS")
-		val monthlyTotal = new NullableDoubleDatabaseField(self, "MONTHLY_TOTAL")
-		val annualTotal = new NullableDoubleDatabaseField(self, "ANNUAL_TOTAL")
-		val hourlyWage = new NullableDoubleDatabaseField(self, "HOURLY_WAGE")
-		val precautionary = new NullableDoubleDatabaseField(self, "PRECAUTIONARY")
-		val retirement = new NullableDoubleDatabaseField(self, "RETIREMENT")
-		val childrensEducationTraining = new NullableDoubleDatabaseField(self, "CHILDRENS_EDUCATION_TRAINING")
-		val homeownership = new NullableDoubleDatabaseField(self, "HOMEOWNERSHIP")
-		val benefits = new NullableStringDatabaseField(self, "BENEFITS", 30)
-		val monthlyTotalTemp = new NullableStringDatabaseField(self, "MONTHLY_TOTAL_TEMP", 50)
-		val annualTotalTemp = new NullableStringDatabaseField(self, "ANNUAL_TOTAL_TEMP", 50)
-		val workerCt = new NullableDoubleDatabaseField(self, "WORKER_CT")
-		val infantCt = new NullableDoubleDatabaseField(self, "INFANT_CT")
-		val preschoolerCt = new NullableDoubleDatabaseField(self, "PRESCHOOLER_CT")
-		val schoolageCt = new NullableDoubleDatabaseField(self, "SCHOOLAGE_CT")
-		val teenageCt = new NullableDoubleDatabaseField(self, "TEENAGE_CT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/EiiExtreme.scala b/entity-templates/EiiExtreme.scala
deleted file mode 100644
index a32b731a..00000000
--- a/entity-templates/EiiExtreme.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EiiExtreme extends StorableClass(EiiExtreme) {
-	object values extends ValuesObject {
-		val eiiMin = new NullableDoubleFieldValue(self, EiiExtreme.fields.eiiMin)
-		val eiiMax = new NullableDoubleFieldValue(self, EiiExtreme.fields.eiiMax)
-	}
-}
-
-object EiiExtreme extends StorableObject[EiiExtreme] {
-	val entityName: String = "EII_EXTREMES"
-
-	object fields extends FieldsObject {
-		val eiiMin = new NullableDoubleDatabaseField(self, "EII_MIN")
-		val eiiMax = new NullableDoubleDatabaseField(self, "EII_MAX")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/EiiMit.scala b/entity-templates/EiiMit.scala
deleted file mode 100644
index a8fe0dc5..00000000
--- a/entity-templates/EiiMit.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EiiMit extends StorableClass(EiiMit) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, EiiMit.fields.rowId)
-		val adults = new NullableDoubleFieldValue(self, EiiMit.fields.adults)
-		val children = new NullableDoubleFieldValue(self, EiiMit.fields.children)
-		val eii = new NullableDoubleFieldValue(self, EiiMit.fields.eii)
-		val generation = new NullableDoubleFieldValue(self, EiiMit.fields.generation)
-	}
-}
-
-object EiiMit extends StorableObject[EiiMit] {
-	val entityName: String = "EII_MIT"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val adults = new NullableDoubleDatabaseField(self, "ADULTS")
-		val children = new NullableDoubleDatabaseField(self, "CHILDREN")
-		val eii = new NullableDoubleDatabaseField(self, "EII")
-		val generation = new NullableDoubleDatabaseField(self, "GENERATION")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/EiiOverride.scala b/entity-templates/EiiOverride.scala
deleted file mode 100644
index 5750b15d..00000000
--- a/entity-templates/EiiOverride.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EiiOverride extends StorableClass(EiiOverride) {
-	object values extends ValuesObject {
-		val personId = new NullableIntFieldValue(self, EiiOverride.fields.personId)
-		val season = new NullableDoubleFieldValue(self, EiiOverride.fields.season)
-		val price = new NullableDoubleFieldValue(self, EiiOverride.fields.price)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, EiiOverride.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, EiiOverride.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, EiiOverride.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, EiiOverride.fields.updatedBy)
-		val overrideId = new IntFieldValue(self, EiiOverride.fields.overrideId)
-	}
-}
-
-object EiiOverride extends StorableObject[EiiOverride] {
-	val entityName: String = "EII_OVERRIDES"
-
-	object fields extends FieldsObject {
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val overrideId = new IntDatabaseField(self, "OVERRIDE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.overrideId
-}
\ No newline at end of file
diff --git a/entity-templates/EiiResponse.scala b/entity-templates/EiiResponse.scala
deleted file mode 100644
index fab26ccc..00000000
--- a/entity-templates/EiiResponse.scala
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EiiResponse extends StorableClass(EiiResponse) {
-	object values extends ValuesObject {
-		val responseId = new IntFieldValue(self, EiiResponse.fields.responseId)
-		val personId = new IntFieldValue(self, EiiResponse.fields.personId)
-		val season = new DoubleFieldValue(self, EiiResponse.fields.season)
-		val workers = new NullableDoubleFieldValue(self, EiiResponse.fields.workers)
-		val benefits = new NullableBooleanFIeldValue(self, EiiResponse.fields.benefits)
-		val infants = new NullableDoubleFieldValue(self, EiiResponse.fields.infants)
-		val preschoolers = new NullableDoubleFieldValue(self, EiiResponse.fields.preschoolers)
-		val schoolagers = new NullableDoubleFieldValue(self, EiiResponse.fields.schoolagers)
-		val teenagers = new NullableDoubleFieldValue(self, EiiResponse.fields.teenagers)
-		val income = new NullableDoubleFieldValue(self, EiiResponse.fields.income)
-		val computedEii = new NullableDoubleFieldValue(self, EiiResponse.fields.computedEii)
-		val computedPrice = new NullableDoubleFieldValue(self, EiiResponse.fields.computedPrice)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, EiiResponse.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, EiiResponse.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, EiiResponse.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, EiiResponse.fields.updatedBy)
-		val isApplying = new NullableBooleanFIeldValue(self, EiiResponse.fields.isApplying)
-		val isCurrent = new BooleanFIeldValue(self, EiiResponse.fields.isCurrent)
-		val status = new NullableBooleanFIeldValue(self, EiiResponse.fields.status)
-		val pdComment = new NullableUnknownFieldType(self, EiiResponse.fields.pdComment)
-		val utilizedInflationFactor = new NullableDoubleFieldValue(self, EiiResponse.fields.utilizedInflationFactor)
-		val children = new NullableDoubleFieldValue(self, EiiResponse.fields.children)
-	}
-}
-
-object EiiResponse extends StorableObject[EiiResponse] {
-	val entityName: String = "EII_RESPONSES"
-
-	object fields extends FieldsObject {
-		val responseId = new IntDatabaseField(self, "RESPONSE_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val season = new DoubleDatabaseField(self, "SEASON")
-		val workers = new NullableDoubleDatabaseField(self, "WORKERS")
-		val benefits = new NullableBooleanDatabaseField(self, "BENEFITS")
-		val infants = new NullableDoubleDatabaseField(self, "INFANTS")
-		val preschoolers = new NullableDoubleDatabaseField(self, "PRESCHOOLERS")
-		val schoolagers = new NullableDoubleDatabaseField(self, "SCHOOLAGERS")
-		val teenagers = new NullableDoubleDatabaseField(self, "TEENAGERS")
-		val income = new NullableDoubleDatabaseField(self, "INCOME")
-		val computedEii = new NullableDoubleDatabaseField(self, "COMPUTED_EII")
-		val computedPrice = new NullableDoubleDatabaseField(self, "COMPUTED_PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val isApplying = new NullableBooleanDatabaseField(self, "IS_APPLYING")
-		val isCurrent = new BooleanDatabaseField(self, "IS_CURRENT")
-		val status = new NullableBooleanDatabaseField(self, "STATUS")
-		val pdComment = new NullableUnknownFieldType(self, "PD_COMMENT")
-		val utilizedInflationFactor = new NullableDoubleDatabaseField(self, "UTILIZED_INFLATION_FACTOR")
-		val children = new NullableDoubleDatabaseField(self, "CHILDREN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.responseId
-}
\ No newline at end of file
diff --git a/entity-templates/EmailContent.scala b/entity-templates/EmailContent.scala
deleted file mode 100644
index 245a9ad7..00000000
--- a/entity-templates/EmailContent.scala
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EmailContent extends StorableClass(EmailContent) {
-	object values extends ValuesObject {
-		val contentId = new IntFieldValue(self, EmailContent.fields.contentId)
-		val fromAddr = new NullableStringFieldValue(self, EmailContent.fields.fromAddr)
-		val ccAddr = new NullableStringFieldValue(self, EmailContent.fields.ccAddr)
-		val bccAddr = new NullableStringFieldValue(self, EmailContent.fields.bccAddr)
-		val subject = new NullableStringFieldValue(self, EmailContent.fields.subject)
-		val plainBody = new NullableStringFieldValue(self, EmailContent.fields.plainBody)
-		val htmlBody = new NullableStringFieldValue(self, EmailContent.fields.htmlBody)
-		val description = new NullableStringFieldValue(self, EmailContent.fields.description)
-		val title = new StringFieldValue(self, EmailContent.fields.title)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, EmailContent.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, EmailContent.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, EmailContent.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, EmailContent.fields.updatedBy)
-		val emailGroupId = new NullableIntFieldValue(self, EmailContent.fields.emailGroupId)
-		val recGroupId = new NullableIntFieldValue(self, EmailContent.fields.recGroupId)
-		val htmlBodyClob = new NullableUnknownFieldType(self, EmailContent.fields.htmlBodyClob)
-		val fromAddrOnly = new NullableStringFieldValue(self, EmailContent.fields.fromAddrOnly)
-		val fromAddrName = new NullableStringFieldValue(self, EmailContent.fields.fromAddrName)
-		val optOutGrpId = new NullableIntFieldValue(self, EmailContent.fields.optOutGrpId)
-		val replyTo = new NullableStringFieldValue(self, EmailContent.fields.replyTo)
-		val hidden = new NullableBooleanFIeldValue(self, EmailContent.fields.hidden)
-	}
-}
-
-object EmailContent extends StorableObject[EmailContent] {
-	val entityName: String = "EMAIL_CONTENT"
-
-	object fields extends FieldsObject {
-		val contentId = new IntDatabaseField(self, "CONTENT_ID")
-		val fromAddr = new NullableStringDatabaseField(self, "FROM_ADDR", 100)
-		val ccAddr = new NullableStringDatabaseField(self, "CC_ADDR", 500)
-		val bccAddr = new NullableStringDatabaseField(self, "BCC_ADDR", 500)
-		val subject = new NullableStringDatabaseField(self, "SUBJECT", 200)
-		val plainBody = new NullableStringDatabaseField(self, "PLAIN_BODY", 4000)
-		val htmlBody = new NullableStringDatabaseField(self, "HTML_BODY", 4000)
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 4000)
-		val title = new StringDatabaseField(self, "TITLE", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val emailGroupId = new NullableIntDatabaseField(self, "EMAIL_GROUP_ID")
-		val recGroupId = new NullableIntDatabaseField(self, "REC_GROUP_ID")
-		val htmlBodyClob = new NullableUnknownFieldType(self, "HTML_BODY_CLOB")
-		val fromAddrOnly = new NullableStringDatabaseField(self, "FROM_ADDR_ONLY", 100)
-		val fromAddrName = new NullableStringDatabaseField(self, "FROM_ADDR_NAME", 100)
-		val optOutGrpId = new NullableIntDatabaseField(self, "OPT_OUT_GRP_ID")
-		val replyTo = new NullableStringDatabaseField(self, "REPLY_TO", 100)
-		val hidden = new NullableBooleanDatabaseField(self, "HIDDEN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.contentId
-}
\ No newline at end of file
diff --git a/entity-templates/EmailContentGroup.scala b/entity-templates/EmailContentGroup.scala
deleted file mode 100644
index a871850e..00000000
--- a/entity-templates/EmailContentGroup.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EmailContentGroup extends StorableClass(EmailContentGroup) {
-	object values extends ValuesObject {
-		val groupId = new IntFieldValue(self, EmailContentGroup.fields.groupId)
-		val groupName = new NullableStringFieldValue(self, EmailContentGroup.fields.groupName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, EmailContentGroup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, EmailContentGroup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, EmailContentGroup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, EmailContentGroup.fields.updatedBy)
-	}
-}
-
-object EmailContentGroup extends StorableObject[EmailContentGroup] {
-	val entityName: String = "EMAIL_CONTENT_GROUPS"
-
-	object fields extends FieldsObject {
-		val groupId = new IntDatabaseField(self, "GROUP_ID")
-		val groupName = new NullableStringDatabaseField(self, "GROUP_NAME", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.groupId
-}
\ No newline at end of file
diff --git a/entity-templates/EmailTracking.scala b/entity-templates/EmailTracking.scala
deleted file mode 100644
index 5dc727d7..00000000
--- a/entity-templates/EmailTracking.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EmailTracking extends StorableClass(EmailTracking) {
-	object values extends ValuesObject {
-		val emailId = new IntFieldValue(self, EmailTracking.fields.emailId)
-		val emailFrom = new NullableStringFieldValue(self, EmailTracking.fields.emailFrom)
-		val emailTo = new NullableStringFieldValue(self, EmailTracking.fields.emailTo)
-		val emailSubj = new NullableStringFieldValue(self, EmailTracking.fields.emailSubj)
-		val emailPlainBody = new NullableStringFieldValue(self, EmailTracking.fields.emailPlainBody)
-		val emailHtmlBody = new NullableStringFieldValue(self, EmailTracking.fields.emailHtmlBody)
-		val sendDatetime = new NullableLocalDateTimeFieldValue(self, EmailTracking.fields.sendDatetime)
-		val emailCc = new NullableStringFieldValue(self, EmailTracking.fields.emailCc)
-		val emailBcc = new NullableStringFieldValue(self, EmailTracking.fields.emailBcc)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, EmailTracking.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, EmailTracking.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, EmailTracking.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, EmailTracking.fields.updatedBy)
-		val status = new NullableBooleanFIeldValue(self, EmailTracking.fields.status)
-		val sendgridJson = new NullableUnknownFieldType(self, EmailTracking.fields.sendgridJson)
-		val retryCt = new NullableDoubleFieldValue(self, EmailTracking.fields.retryCt)
-		val emailFromAddrName = new NullableStringFieldValue(self, EmailTracking.fields.emailFromAddrName)
-		val emailFromAddrOnly = new NullableStringFieldValue(self, EmailTracking.fields.emailFromAddrOnly)
-		val optOutGrpId = new NullableIntFieldValue(self, EmailTracking.fields.optOutGrpId)
-		val sendgridResp = new NullableStringFieldValue(self, EmailTracking.fields.sendgridResp)
-	}
-}
-
-object EmailTracking extends StorableObject[EmailTracking] {
-	val entityName: String = "EMAIL_TRACKING"
-
-	object fields extends FieldsObject {
-		val emailId = new IntDatabaseField(self, "EMAIL_ID")
-		val emailFrom = new NullableStringDatabaseField(self, "EMAIL_FROM", 200)
-		val emailTo = new NullableStringDatabaseField(self, "EMAIL_TO", 200)
-		val emailSubj = new NullableStringDatabaseField(self, "EMAIL_SUBJ", 500)
-		val emailPlainBody = new NullableStringDatabaseField(self, "EMAIL_PLAIN_BODY", 4000)
-		val emailHtmlBody = new NullableStringDatabaseField(self, "EMAIL_HTML_BODY", 4000)
-		val sendDatetime = new NullableLocalDateTimeDatabaseField(self, "SEND_DATETIME")
-		val emailCc = new NullableStringDatabaseField(self, "EMAIL_CC", 200)
-		val emailBcc = new NullableStringDatabaseField(self, "EMAIL_BCC", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val status = new NullableBooleanDatabaseField(self, "STATUS")
-		val sendgridJson = new NullableUnknownFieldType(self, "SENDGRID_JSON")
-		val retryCt = new NullableDoubleDatabaseField(self, "RETRY_CT")
-		val emailFromAddrName = new NullableStringDatabaseField(self, "EMAIL_FROM_ADDR_NAME", 100)
-		val emailFromAddrOnly = new NullableStringDatabaseField(self, "EMAIL_FROM_ADDR_ONLY", 100)
-		val optOutGrpId = new NullableIntDatabaseField(self, "OPT_OUT_GRP_ID")
-		val sendgridResp = new NullableStringDatabaseField(self, "SENDGRID_RESP", 20)
-	}
-
-	def primaryKey: IntDatabaseField = fields.emailId
-}
\ No newline at end of file
diff --git a/entity-templates/ErrorType.scala b/entity-templates/ErrorType.scala
deleted file mode 100644
index fabf9fab..00000000
--- a/entity-templates/ErrorType.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ErrorType extends StorableClass(ErrorType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, ErrorType.fields.typeId)
-		val errorMessage = new NullableStringFieldValue(self, ErrorType.fields.errorMessage)
-		val throwCount = new NullableDoubleFieldValue(self, ErrorType.fields.throwCount)
-		val lastInstance = new NullableLocalDateTimeFieldValue(self, ErrorType.fields.lastInstance)
-	}
-}
-
-object ErrorType extends StorableObject[ErrorType] {
-	val entityName: String = "ERROR_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val errorMessage = new NullableStringDatabaseField(self, "ERROR_MESSAGE", 4000)
-		val throwCount = new NullableDoubleDatabaseField(self, "THROW_COUNT")
-		val lastInstance = new NullableLocalDateTimeDatabaseField(self, "LAST_INSTANCE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/EstimatedSignin.scala b/entity-templates/EstimatedSignin.scala
deleted file mode 100644
index 16046a90..00000000
--- a/entity-templates/EstimatedSignin.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class EstimatedSignin extends StorableClass(EstimatedSignin) {
-	object values extends ValuesObject {
-		val signoutId = new IntFieldValue(self, EstimatedSignin.fields.signoutId)
-		val estSigninDatetime = new NullableLocalDateTimeFieldValue(self, EstimatedSignin.fields.estSigninDatetime)
-	}
-}
-
-object EstimatedSignin extends StorableObject[EstimatedSignin] {
-	val entityName: String = "ESTIMATED_SIGNINS"
-
-	object fields extends FieldsObject {
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-		val estSigninDatetime = new NullableLocalDateTimeDatabaseField(self, "EST_SIGNIN_DATETIME")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/Event.scala b/entity-templates/Event.scala
deleted file mode 100644
index d6ae7fa1..00000000
--- a/entity-templates/Event.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Event extends StorableClass(Event) {
-	object values extends ValuesObject {
-		val eventId = new IntFieldValue(self, Event.fields.eventId)
-		val eventName = new NullableStringFieldValue(self, Event.fields.eventName)
-		val eventDate = new NullableLocalDateTimeFieldValue(self, Event.fields.eventDate)
-		val active = new NullableBooleanFIeldValue(self, Event.fields.active)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Event.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Event.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Event.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Event.fields.updatedBy)
-		val displayOrder = new NullableDoubleFieldValue(self, Event.fields.displayOrder)
-	}
-}
-
-object Event extends StorableObject[Event] {
-	val entityName: String = "EVENTS"
-
-	object fields extends FieldsObject {
-		val eventId = new IntDatabaseField(self, "EVENT_ID")
-		val eventName = new NullableStringDatabaseField(self, "EVENT_NAME", 200)
-		val eventDate = new NullableLocalDateTimeDatabaseField(self, "EVENT_DATE")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.eventId
-}
\ No newline at end of file
diff --git a/entity-templates/Feedback.scala b/entity-templates/Feedback.scala
deleted file mode 100644
index 0d9e3ef0..00000000
--- a/entity-templates/Feedback.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Feedback extends StorableClass(Feedback) {
-	object values extends ValuesObject {
-		val feedbackId = new IntFieldValue(self, Feedback.fields.feedbackId)
-		val appAlias = new NullableStringFieldValue(self, Feedback.fields.appAlias)
-		val appPageId = new NullableIntFieldValue(self, Feedback.fields.appPageId)
-		val description = new NullableUnknownFieldType(self, Feedback.fields.description)
-		val userName = new NullableStringFieldValue(self, Feedback.fields.userName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Feedback.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Feedback.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Feedback.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Feedback.fields.updatedBy)
-		val appId = new NullableIntFieldValue(self, Feedback.fields.appId)
-	}
-}
-
-object Feedback extends StorableObject[Feedback] {
-	val entityName: String = "FEEDBACK"
-
-	object fields extends FieldsObject {
-		val feedbackId = new IntDatabaseField(self, "FEEDBACK_ID")
-		val appAlias = new NullableStringDatabaseField(self, "APP_ALIAS", 100)
-		val appPageId = new NullableIntDatabaseField(self, "APP_PAGE_ID")
-		val description = new NullableUnknownFieldType(self, "DESCRIPTION")
-		val userName = new NullableStringDatabaseField(self, "USER_NAME", 20)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val appId = new NullableIntDatabaseField(self, "APP_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.feedbackId
-}
\ No newline at end of file
diff --git a/entity-templates/FlagChange.scala b/entity-templates/FlagChange.scala
deleted file mode 100644
index b0cc5328..00000000
--- a/entity-templates/FlagChange.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FlagChange extends StorableClass(FlagChange) {
-	object values extends ValuesObject {
-		val changeId = new IntFieldValue(self, FlagChange.fields.changeId)
-		val flag = new BooleanFIeldValue(self, FlagChange.fields.flag)
-		val changeDatetime = new LocalDateTimeFieldValue(self, FlagChange.fields.changeDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FlagChange.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FlagChange.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FlagChange.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FlagChange.fields.updatedBy)
-	}
-}
-
-object FlagChange extends StorableObject[FlagChange] {
-	val entityName: String = "FLAG_CHANGES"
-
-	object fields extends FieldsObject {
-		val changeId = new IntDatabaseField(self, "CHANGE_ID")
-		val flag = new BooleanDatabaseField(self, "FLAG")
-		val changeDatetime = new LocalDateTimeDatabaseField(self, "CHANGE_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.changeId
-}
\ No newline at end of file
diff --git a/entity-templates/FlagsGlobal.scala b/entity-templates/FlagsGlobal.scala
deleted file mode 100644
index e53a5dc2..00000000
--- a/entity-templates/FlagsGlobal.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FlagsGlobal extends StorableClass(FlagsGlobal) {
-	object values extends ValuesObject {
-		val flagId = new IntFieldValue(self, FlagsGlobal.fields.flagId)
-		val globalId = new IntFieldValue(self, FlagsGlobal.fields.globalId)
-		val globalValue = new NullableBooleanFIeldValue(self, FlagsGlobal.fields.globalValue)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FlagsGlobal.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FlagsGlobal.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FlagsGlobal.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FlagsGlobal.fields.updatedBy)
-	}
-}
-
-object FlagsGlobal extends StorableObject[FlagsGlobal] {
-	val entityName: String = "FLAGS_GLOBALS"
-
-	object fields extends FieldsObject {
-		val flagId = new IntDatabaseField(self, "FLAG_ID")
-		val globalId = new IntDatabaseField(self, "GLOBAL_ID")
-		val globalValue = new NullableBooleanDatabaseField(self, "GLOBAL_VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.flagId
-}
\ No newline at end of file
diff --git a/entity-templates/FoAlert.scala b/entity-templates/FoAlert.scala
deleted file mode 100644
index 536029b3..00000000
--- a/entity-templates/FoAlert.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoAlert extends StorableClass(FoAlert) {
-	object values extends ValuesObject {
-		val alert = new NullableStringFieldValue(self, FoAlert.fields.alert)
-	}
-}
-
-object FoAlert extends StorableObject[FoAlert] {
-	val entityName: String = "FO_ALERTS"
-
-	object fields extends FieldsObject {
-		val alert = new NullableStringDatabaseField(self, "ALERT", 294)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/FoAppliedGc.scala b/entity-templates/FoAppliedGc.scala
deleted file mode 100644
index 054c51ac..00000000
--- a/entity-templates/FoAppliedGc.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoAppliedGc extends StorableClass(FoAppliedGc) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, FoAppliedGc.fields.rowId)
-		val closeId = new NullableIntFieldValue(self, FoAppliedGc.fields.closeId)
-		val certId = new NullableIntFieldValue(self, FoAppliedGc.fields.certId)
-		val value = new NullableDoubleFieldValue(self, FoAppliedGc.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoAppliedGc.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoAppliedGc.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoAppliedGc.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoAppliedGc.fields.updatedBy)
-		val pmAssignId = new NullableIntFieldValue(self, FoAppliedGc.fields.pmAssignId)
-		val orderId = new NullableIntFieldValue(self, FoAppliedGc.fields.orderId)
-		val voidCloseId = new NullableIntFieldValue(self, FoAppliedGc.fields.voidCloseId)
-	}
-}
-
-object FoAppliedGc extends StorableObject[FoAppliedGc] {
-	val entityName: String = "FO_APPLIED_GC"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val certId = new NullableIntDatabaseField(self, "CERT_ID")
-		val value = new NullableDoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val pmAssignId = new NullableIntDatabaseField(self, "PM_ASSIGN_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoAr.scala b/entity-templates/FoAr.scala
deleted file mode 100644
index 71a54868..00000000
--- a/entity-templates/FoAr.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoAr extends StorableClass(FoAr) {
-	object values extends ValuesObject {
-		val arId = new IntFieldValue(self, FoAr.fields.arId)
-		val closeId = new IntFieldValue(self, FoAr.fields.closeId)
-		val sourceId = new IntFieldValue(self, FoAr.fields.sourceId)
-		val value = new DoubleFieldValue(self, FoAr.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoAr.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoAr.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoAr.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoAr.fields.updatedBy)
-	}
-}
-
-object FoAr extends StorableObject[FoAr] {
-	val entityName: String = "FO_AR"
-
-	object fields extends FieldsObject {
-		val arId = new IntDatabaseField(self, "AR_ID")
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val sourceId = new IntDatabaseField(self, "SOURCE_ID")
-		val value = new DoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.arId
-}
\ No newline at end of file
diff --git a/entity-templates/FoArSource.scala b/entity-templates/FoArSource.scala
deleted file mode 100644
index c61b01c1..00000000
--- a/entity-templates/FoArSource.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoArSource extends StorableClass(FoArSource) {
-	object values extends ValuesObject {
-		val sourceId = new IntFieldValue(self, FoArSource.fields.sourceId)
-		val sourceName = new StringFieldValue(self, FoArSource.fields.sourceName)
-		val active = new NullableBooleanFIeldValue(self, FoArSource.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, FoArSource.fields.displayOrder)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoArSource.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoArSource.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoArSource.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoArSource.fields.updatedBy)
-		val isOnline = new BooleanFIeldValue(self, FoArSource.fields.isOnline)
-		val readOnly = new NullableBooleanFIeldValue(self, FoArSource.fields.readOnly)
-	}
-}
-
-object FoArSource extends StorableObject[FoArSource] {
-	val entityName: String = "FO_AR_SOURCES"
-
-	object fields extends FieldsObject {
-		val sourceId = new IntDatabaseField(self, "SOURCE_ID")
-		val sourceName = new StringDatabaseField(self, "SOURCE_NAME", 100)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val isOnline = new BooleanDatabaseField(self, "IS_ONLINE")
-		val readOnly = new NullableBooleanDatabaseField(self, "READ_ONLY")
-	}
-
-	def primaryKey: IntDatabaseField = fields.sourceId
-}
\ No newline at end of file
diff --git a/entity-templates/FoCash.scala b/entity-templates/FoCash.scala
deleted file mode 100644
index 8df9540f..00000000
--- a/entity-templates/FoCash.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCash extends StorableClass(FoCash) {
-	object values extends ValuesObject {
-		val cashId = new IntFieldValue(self, FoCash.fields.cashId)
-		val closeId = new IntFieldValue(self, FoCash.fields.closeId)
-		val locationIndex = new DoubleFieldValue(self, FoCash.fields.locationIndex)
-		val value = new DoubleFieldValue(self, FoCash.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoCash.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoCash.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoCash.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoCash.fields.updatedBy)
-		val denomIndex = new DoubleFieldValue(self, FoCash.fields.denomIndex)
-	}
-}
-
-object FoCash extends StorableObject[FoCash] {
-	val entityName: String = "FO_CASH"
-
-	object fields extends FieldsObject {
-		val cashId = new IntDatabaseField(self, "CASH_ID")
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val locationIndex = new DoubleDatabaseField(self, "LOCATION_INDEX")
-		val value = new DoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val denomIndex = new DoubleDatabaseField(self, "DENOM_INDEX")
-	}
-
-	def primaryKey: IntDatabaseField = fields.cashId
-}
\ No newline at end of file
diff --git a/entity-templates/FoCashDenomination.scala b/entity-templates/FoCashDenomination.scala
deleted file mode 100644
index 0f9cee66..00000000
--- a/entity-templates/FoCashDenomination.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCashDenomination extends StorableClass(FoCashDenomination) {
-	object values extends ValuesObject {
-		val denomIndex = new DoubleFieldValue(self, FoCashDenomination.fields.denomIndex)
-		val denomination = new DoubleFieldValue(self, FoCashDenomination.fields.denomination)
-		val billCoin = new BooleanFIeldValue(self, FoCashDenomination.fields.billCoin)
-	}
-}
-
-object FoCashDenomination extends StorableObject[FoCashDenomination] {
-	val entityName: String = "FO_CASH_DENOMINATIONS"
-
-	object fields extends FieldsObject {
-		val denomIndex = new DoubleDatabaseField(self, "DENOM_INDEX")
-		val denomination = new DoubleDatabaseField(self, "DENOMINATION")
-		val billCoin = new BooleanDatabaseField(self, "BILL_COIN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.denomIndex
-}
\ No newline at end of file
diff --git a/entity-templates/FoCashLocation.scala b/entity-templates/FoCashLocation.scala
deleted file mode 100644
index 53cb5f0e..00000000
--- a/entity-templates/FoCashLocation.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCashLocation extends StorableClass(FoCashLocation) {
-	object values extends ValuesObject {
-		val locationIndex = new DoubleFieldValue(self, FoCashLocation.fields.locationIndex)
-		val locationNameShort = new StringFieldValue(self, FoCashLocation.fields.locationNameShort)
-		val locationNameLong = new NullableStringFieldValue(self, FoCashLocation.fields.locationNameLong)
-		val open = new BooleanFIeldValue(self, FoCashLocation.fields.open)
-	}
-}
-
-object FoCashLocation extends StorableObject[FoCashLocation] {
-	val entityName: String = "FO_CASH_LOCATIONS"
-
-	object fields extends FieldsObject {
-		val locationIndex = new DoubleDatabaseField(self, "LOCATION_INDEX")
-		val locationNameShort = new StringDatabaseField(self, "LOCATION_NAME_SHORT", 5)
-		val locationNameLong = new NullableStringDatabaseField(self, "LOCATION_NAME_LONG", 100)
-		val open = new BooleanDatabaseField(self, "OPEN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.locationIndex
-}
\ No newline at end of file
diff --git a/entity-templates/FoCheck.scala b/entity-templates/FoCheck.scala
deleted file mode 100644
index d6b52a3a..00000000
--- a/entity-templates/FoCheck.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCheck extends StorableClass(FoCheck) {
-	object values extends ValuesObject {
-		val checkId = new IntFieldValue(self, FoCheck.fields.checkId)
-		val closeId = new IntFieldValue(self, FoCheck.fields.closeId)
-		val value = new DoubleFieldValue(self, FoCheck.fields.value)
-		val checkNum = new NullableStringFieldValue(self, FoCheck.fields.checkNum)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoCheck.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoCheck.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoCheck.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoCheck.fields.updatedBy)
-		val checkName = new NullableStringFieldValue(self, FoCheck.fields.checkName)
-		val voidCloseId = new NullableIntFieldValue(self, FoCheck.fields.voidCloseId)
-		val checkDate = new NullableLocalDateTimeFieldValue(self, FoCheck.fields.checkDate)
-	}
-}
-
-object FoCheck extends StorableObject[FoCheck] {
-	val entityName: String = "FO_CHECKS"
-
-	object fields extends FieldsObject {
-		val checkId = new IntDatabaseField(self, "CHECK_ID")
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val value = new DoubleDatabaseField(self, "VALUE")
-		val checkNum = new NullableStringDatabaseField(self, "CHECK_NUM", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val checkName = new NullableStringDatabaseField(self, "CHECK_NAME", 500)
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val checkDate = new NullableLocalDateTimeDatabaseField(self, "CHECK_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.checkId
-}
\ No newline at end of file
diff --git a/entity-templates/FoCheckWithX.scala b/entity-templates/FoCheckWithX.scala
deleted file mode 100644
index 35dc04ac..00000000
--- a/entity-templates/FoCheckWithX.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCheckWithX extends StorableClass(FoCheckWithX) {
-	object values extends ValuesObject {
-		val closeId = new NullableIntFieldValue(self, FoCheckWithX.fields.closeId)
-		val code = new NullableDoubleFieldValue(self, FoCheckWithX.fields.code)
-		val itemDesc = new NullableStringFieldValue(self, FoCheckWithX.fields.itemDesc)
-		val ct = new NullableDoubleFieldValue(self, FoCheckWithX.fields.ct)
-		val total = new NullableDoubleFieldValue(self, FoCheckWithX.fields.total)
-	}
-}
-
-object FoCheckWithX extends StorableObject[FoCheckWithX] {
-	val entityName: String = "FO_CHECK_WITH_X"
-
-	object fields extends FieldsObject {
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val code = new NullableDoubleDatabaseField(self, "CODE")
-		val itemDesc = new NullableStringDatabaseField(self, "ITEM_DESC", 200)
-		val ct = new NullableDoubleDatabaseField(self, "CT")
-		val total = new NullableDoubleDatabaseField(self, "TOTAL")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/FoClose.scala b/entity-templates/FoClose.scala
deleted file mode 100644
index 7f5e0ea1..00000000
--- a/entity-templates/FoClose.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoClose extends StorableClass(FoClose) {
-	object values extends ValuesObject {
-		val closeId = new IntFieldValue(self, FoClose.fields.closeId)
-		val closedDatetime = new NullableLocalDateTimeFieldValue(self, FoClose.fields.closedDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoClose.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoClose.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoClose.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoClose.fields.updatedBy)
-		val batchNet = new NullableDoubleFieldValue(self, FoClose.fields.batchNet)
-		val batchNum = new NullableDoubleFieldValue(self, FoClose.fields.batchNum)
-		val itemCt = new NullableDoubleFieldValue(self, FoClose.fields.itemCt)
-		val settleRef = new NullableStringFieldValue(self, FoClose.fields.settleRef)
-		val closed = new NullableBooleanFIeldValue(self, FoClose.fields.closed)
-		val tapeValue = new NullableDoubleFieldValue(self, FoClose.fields.tapeValue)
-		val notes = new NullableUnknownFieldType(self, FoClose.fields.notes)
-		val finalizedBy = new NullableDoubleFieldValue(self, FoClose.fields.finalizedBy)
-		val closeAlias = new NullableStringFieldValue(self, FoClose.fields.closeAlias)
-		val tallyValueAtClose = new NullableDoubleFieldValue(self, FoClose.fields.tallyValueAtClose)
-		val settledDatetime = new NullableLocalDateTimeFieldValue(self, FoClose.fields.settledDatetime)
-		val nextSettleReminderSent = new NullableLocalDateTimeFieldValue(self, FoClose.fields.nextSettleReminderSent)
-		val stripeTallyAtClose = new NullableDoubleFieldValue(self, FoClose.fields.stripeTallyAtClose)
-	}
-}
-
-object FoClose extends StorableObject[FoClose] {
-	val entityName: String = "FO_CLOSES"
-
-	object fields extends FieldsObject {
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val closedDatetime = new NullableLocalDateTimeDatabaseField(self, "CLOSED_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val batchNet = new NullableDoubleDatabaseField(self, "BATCH_NET")
-		val batchNum = new NullableDoubleDatabaseField(self, "BATCH_NUM")
-		val itemCt = new NullableDoubleDatabaseField(self, "ITEM_CT")
-		val settleRef = new NullableStringDatabaseField(self, "SETTLE_REF", 20)
-		val closed = new NullableBooleanDatabaseField(self, "CLOSED")
-		val tapeValue = new NullableDoubleDatabaseField(self, "TAPE_VALUE")
-		val notes = new NullableUnknownFieldType(self, "NOTES")
-		val finalizedBy = new NullableDoubleDatabaseField(self, "FINALIZED_BY")
-		val closeAlias = new NullableStringDatabaseField(self, "CLOSE_ALIAS", 100)
-		val tallyValueAtClose = new NullableDoubleDatabaseField(self, "TALLY_VALUE_AT_CLOSE")
-		val settledDatetime = new NullableLocalDateTimeDatabaseField(self, "SETTLED_DATETIME")
-		val nextSettleReminderSent = new NullableLocalDateTimeDatabaseField(self, "NEXT_SETTLE_REMINDER_SENT")
-		val stripeTallyAtClose = new NullableDoubleDatabaseField(self, "STRIPE_TALLY_AT_CLOSE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.closeId
-}
\ No newline at end of file
diff --git a/entity-templates/FoCloseUser.scala b/entity-templates/FoCloseUser.scala
deleted file mode 100644
index 5fb70a8e..00000000
--- a/entity-templates/FoCloseUser.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCloseUser extends StorableClass(FoCloseUser) {
-	object values extends ValuesObject {
-		val closeId = new IntFieldValue(self, FoCloseUser.fields.closeId)
-		val userId = new IntFieldValue(self, FoCloseUser.fields.userId)
-		val openClose = new BooleanFIeldValue(self, FoCloseUser.fields.openClose)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoCloseUser.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoCloseUser.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoCloseUser.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoCloseUser.fields.updatedBy)
-	}
-}
-
-object FoCloseUser extends StorableObject[FoCloseUser] {
-	val entityName: String = "FO_CLOSE_USERS"
-
-	object fields extends FieldsObject {
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val userId = new IntDatabaseField(self, "USER_ID")
-		val openClose = new BooleanDatabaseField(self, "OPEN_CLOSE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.closeId
-}
\ No newline at end of file
diff --git a/entity-templates/FoCurrentClose.scala b/entity-templates/FoCurrentClose.scala
deleted file mode 100644
index 0a806632..00000000
--- a/entity-templates/FoCurrentClose.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoCurrentClose extends StorableClass(FoCurrentClose) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, FoCurrentClose.fields.rowId)
-		val inPersonId = new IntFieldValue(self, FoCurrentClose.fields.inPersonId)
-		val onlineId = new IntFieldValue(self, FoCurrentClose.fields.onlineId)
-	}
-}
-
-object FoCurrentClose extends StorableObject[FoCurrentClose] {
-	val entityName: String = "FO_CURRENT_CLOSES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val inPersonId = new IntDatabaseField(self, "IN_PERSON_ID")
-		val onlineId = new IntDatabaseField(self, "ONLINE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoItem.scala b/entity-templates/FoItem.scala
deleted file mode 100644
index 46a1a68e..00000000
--- a/entity-templates/FoItem.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoItem extends StorableClass(FoItem) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, FoItem.fields.rowId)
-		val itemId = new NullableIntFieldValue(self, FoItem.fields.itemId)
-		val closeId = new NullableIntFieldValue(self, FoItem.fields.closeId)
-		val unitPrice = new NullableDoubleFieldValue(self, FoItem.fields.unitPrice)
-		val discountsTotal = new NullableDoubleFieldValue(self, FoItem.fields.discountsTotal)
-		val qtySold = new NullableDoubleFieldValue(self, FoItem.fields.qtySold)
-		val qtyComped = new NullableDoubleFieldValue(self, FoItem.fields.qtyComped)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoItem.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoItem.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoItem.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoItem.fields.updatedBy)
-		val taxRate = new NullableDoubleFieldValue(self, FoItem.fields.taxRate)
-	}
-}
-
-object FoItem extends StorableObject[FoItem] {
-	val entityName: String = "FO_ITEMS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val unitPrice = new NullableDoubleDatabaseField(self, "UNIT_PRICE")
-		val discountsTotal = new NullableDoubleDatabaseField(self, "DISCOUNTS_TOTAL")
-		val qtySold = new NullableDoubleDatabaseField(self, "QTY_SOLD")
-		val qtyComped = new NullableDoubleDatabaseField(self, "QTY_COMPED")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val taxRate = new NullableDoubleDatabaseField(self, "TAX_RATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoItemCategorie.scala b/entity-templates/FoItemCategorie.scala
deleted file mode 100644
index 76508f7d..00000000
--- a/entity-templates/FoItemCategorie.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoItemCategorie extends StorableClass(FoItemCategorie) {
-	object values extends ValuesObject {
-		val categoryId = new IntFieldValue(self, FoItemCategorie.fields.categoryId)
-		val categoryName = new NullableStringFieldValue(self, FoItemCategorie.fields.categoryName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoItemCategorie.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoItemCategorie.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoItemCategorie.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoItemCategorie.fields.updatedBy)
-	}
-}
-
-object FoItemCategorie extends StorableObject[FoItemCategorie] {
-	val entityName: String = "FO_ITEM_CATEGORIES"
-
-	object fields extends FieldsObject {
-		val categoryId = new IntDatabaseField(self, "CATEGORY_ID")
-		val categoryName = new NullableStringDatabaseField(self, "CATEGORY_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.categoryId
-}
\ No newline at end of file
diff --git a/entity-templates/FoItemType.scala b/entity-templates/FoItemType.scala
deleted file mode 100644
index 86fd636e..00000000
--- a/entity-templates/FoItemType.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoItemType extends StorableClass(FoItemType) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, FoItemType.fields.rowId)
-		val typeId = new NullableIntFieldValue(self, FoItemType.fields.typeId)
-		val closeId = new NullableIntFieldValue(self, FoItemType.fields.closeId)
-		val discountsTotal = new NullableDoubleFieldValue(self, FoItemType.fields.discountsTotal)
-		val qtySold = new NullableDoubleFieldValue(self, FoItemType.fields.qtySold)
-		val qtyComped = new NullableDoubleFieldValue(self, FoItemType.fields.qtyComped)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoItemType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoItemType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoItemType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoItemType.fields.updatedBy)
-		val unitPrice = new NullableDoubleFieldValue(self, FoItemType.fields.unitPrice)
-		val taxRate = new NullableDoubleFieldValue(self, FoItemType.fields.taxRate)
-	}
-}
-
-object FoItemType extends StorableObject[FoItemType] {
-	val entityName: String = "FO_ITEM_TYPES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val discountsTotal = new NullableDoubleDatabaseField(self, "DISCOUNTS_TOTAL")
-		val qtySold = new NullableDoubleDatabaseField(self, "QTY_SOLD")
-		val qtyComped = new NullableDoubleDatabaseField(self, "QTY_COMPED")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val unitPrice = new NullableDoubleDatabaseField(self, "UNIT_PRICE")
-		val taxRate = new NullableDoubleDatabaseField(self, "TAX_RATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoItemTypesLookup.scala b/entity-templates/FoItemTypesLookup.scala
deleted file mode 100644
index 30696f0d..00000000
--- a/entity-templates/FoItemTypesLookup.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoItemTypesLookup extends StorableClass(FoItemTypesLookup) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, FoItemTypesLookup.fields.typeId)
-		val itemId = new NullableIntFieldValue(self, FoItemTypesLookup.fields.itemId)
-		val description = new NullableStringFieldValue(self, FoItemTypesLookup.fields.description)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoItemTypesLookup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoItemTypesLookup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoItemTypesLookup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoItemTypesLookup.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, FoItemTypesLookup.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, FoItemTypesLookup.fields.displayOrder)
-	}
-}
-
-object FoItemTypesLookup extends StorableObject[FoItemTypesLookup] {
-	val entityName: String = "FO_ITEM_TYPES_LOOKUP"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/FoItemsLookup.scala b/entity-templates/FoItemsLookup.scala
deleted file mode 100644
index 95550dcd..00000000
--- a/entity-templates/FoItemsLookup.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoItemsLookup extends StorableClass(FoItemsLookup) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, FoItemsLookup.fields.itemId)
-		val categoryId = new NullableIntFieldValue(self, FoItemsLookup.fields.categoryId)
-		val itemName = new NullableStringFieldValue(self, FoItemsLookup.fields.itemName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoItemsLookup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoItemsLookup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoItemsLookup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoItemsLookup.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, FoItemsLookup.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, FoItemsLookup.fields.displayOrder)
-		val currentPrice = new DoubleFieldValue(self, FoItemsLookup.fields.currentPrice)
-		val regCodeRowId = new NullableIntFieldValue(self, FoItemsLookup.fields.regCodeRowId)
-		val taxable = new NullableBooleanFIeldValue(self, FoItemsLookup.fields.taxable)
-	}
-}
-
-object FoItemsLookup extends StorableObject[FoItemsLookup] {
-	val entityName: String = "FO_ITEMS_LOOKUP"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val categoryId = new NullableIntDatabaseField(self, "CATEGORY_ID")
-		val itemName = new NullableStringDatabaseField(self, "ITEM_NAME", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val currentPrice = new DoubleDatabaseField(self, "CURRENT_PRICE")
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-		val taxable = new NullableBooleanDatabaseField(self, "TAXABLE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/FoMisc.scala b/entity-templates/FoMisc.scala
deleted file mode 100644
index bc4f4c8c..00000000
--- a/entity-templates/FoMisc.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoMisc extends StorableClass(FoMisc) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, FoMisc.fields.rowId)
-		val itemId = new NullableIntFieldValue(self, FoMisc.fields.itemId)
-		val closeId = new NullableIntFieldValue(self, FoMisc.fields.closeId)
-		val qtySold = new NullableDoubleFieldValue(self, FoMisc.fields.qtySold)
-		val totalPrice = new NullableDoubleFieldValue(self, FoMisc.fields.totalPrice)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoMisc.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoMisc.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoMisc.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoMisc.fields.updatedBy)
-		val qtyComped = new NullableDoubleFieldValue(self, FoMisc.fields.qtyComped)
-		val totalComp = new NullableDoubleFieldValue(self, FoMisc.fields.totalComp)
-		val taxRate = new NullableDoubleFieldValue(self, FoMisc.fields.taxRate)
-		val totalPretax = new NullableDoubleFieldValue(self, FoMisc.fields.totalPretax)
-	}
-}
-
-object FoMisc extends StorableObject[FoMisc] {
-	val entityName: String = "FO_MISC"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val qtySold = new NullableDoubleDatabaseField(self, "QTY_SOLD")
-		val totalPrice = new NullableDoubleDatabaseField(self, "TOTAL_PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val qtyComped = new NullableDoubleDatabaseField(self, "QTY_COMPED")
-		val totalComp = new NullableDoubleDatabaseField(self, "TOTAL_COMP")
-		val taxRate = new NullableDoubleDatabaseField(self, "TAX_RATE")
-		val totalPretax = new NullableDoubleDatabaseField(self, "TOTAL_PRETAX")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoMiscLookup.scala b/entity-templates/FoMiscLookup.scala
deleted file mode 100644
index f8cb86fe..00000000
--- a/entity-templates/FoMiscLookup.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoMiscLookup extends StorableClass(FoMiscLookup) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, FoMiscLookup.fields.itemId)
-		val itemName = new NullableStringFieldValue(self, FoMiscLookup.fields.itemName)
-		val active = new NullableBooleanFIeldValue(self, FoMiscLookup.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, FoMiscLookup.fields.displayOrder)
-		val regCodeRowId = new NullableIntFieldValue(self, FoMiscLookup.fields.regCodeRowId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoMiscLookup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoMiscLookup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoMiscLookup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoMiscLookup.fields.updatedBy)
-		val taxable = new NullableBooleanFIeldValue(self, FoMiscLookup.fields.taxable)
-	}
-}
-
-object FoMiscLookup extends StorableObject[FoMiscLookup] {
-	val entityName: String = "FO_MISC_LOOKUP"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val itemName = new NullableStringDatabaseField(self, "ITEM_NAME", 200)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val taxable = new NullableBooleanDatabaseField(self, "TAXABLE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/FoParking.scala b/entity-templates/FoParking.scala
deleted file mode 100644
index 4d5d16e4..00000000
--- a/entity-templates/FoParking.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoParking extends StorableClass(FoParking) {
-	object values extends ValuesObject {
-		val closeId = new IntFieldValue(self, FoParking.fields.closeId)
-		val openCt = new NullableDoubleFieldValue(self, FoParking.fields.openCt)
-		val closeCt = new NullableDoubleFieldValue(self, FoParking.fields.closeCt)
-		val changeCt = new NullableDoubleFieldValue(self, FoParking.fields.changeCt)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoParking.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoParking.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoParking.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoParking.fields.updatedBy)
-		val compCt = new NullableDoubleFieldValue(self, FoParking.fields.compCt)
-		val unitPrice = new DoubleFieldValue(self, FoParking.fields.unitPrice)
-	}
-}
-
-object FoParking extends StorableObject[FoParking] {
-	val entityName: String = "FO_PARKING"
-
-	object fields extends FieldsObject {
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val openCt = new NullableDoubleDatabaseField(self, "OPEN_CT")
-		val closeCt = new NullableDoubleDatabaseField(self, "CLOSE_CT")
-		val changeCt = new NullableDoubleDatabaseField(self, "CHANGE_CT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val compCt = new NullableDoubleDatabaseField(self, "COMP_CT")
-		val unitPrice = new DoubleDatabaseField(self, "UNIT_PRICE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.closeId
-}
\ No newline at end of file
diff --git a/entity-templates/FoRegCode.scala b/entity-templates/FoRegCode.scala
deleted file mode 100644
index d58d787f..00000000
--- a/entity-templates/FoRegCode.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoRegCode extends StorableClass(FoRegCode) {
-	object values extends ValuesObject {
-		val code = new NullableDoubleFieldValue(self, FoRegCode.fields.code)
-		val description = new NullableStringFieldValue(self, FoRegCode.fields.description)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, FoRegCode.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, FoRegCode.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, FoRegCode.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, FoRegCode.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, FoRegCode.fields.active)
-		val rowId = new IntFieldValue(self, FoRegCode.fields.rowId)
-	}
-}
-
-object FoRegCode extends StorableObject[FoRegCode] {
-	val entityName: String = "FO_REG_CODES"
-
-	object fields extends FieldsObject {
-		val code = new NullableDoubleDatabaseField(self, "CODE")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/FoRetailId.scala b/entity-templates/FoRetailId.scala
deleted file mode 100644
index a3c76a16..00000000
--- a/entity-templates/FoRetailId.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FoRetailId extends StorableClass(FoRetailId) {
-	object values extends ValuesObject {
-		val class = new NullableBooleanFIeldValue(self, FoRetailId.fields.class)
-		val id = new NullableIntFieldValue(self, FoRetailId.fields.id)
-		val taxable = new NullableBooleanFIeldValue(self, FoRetailId.fields.taxable)
-	}
-}
-
-object FoRetailId extends StorableObject[FoRetailId] {
-	val entityName: String = "FO_RETAIL_IDS"
-
-	object fields extends FieldsObject {
-		val class = new NullableBooleanDatabaseField(self, "CLASS")
-		val id = new NullableIntDatabaseField(self, "ID")
-		val taxable = new NullableBooleanDatabaseField(self, "TAXABLE")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/FullCart.scala b/entity-templates/FullCart.scala
deleted file mode 100644
index fe880981..00000000
--- a/entity-templates/FullCart.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FullCart extends StorableClass(FullCart) {
-	object values extends ValuesObject {
-		val itemName = new NullableStringFieldValue(self, FullCart.fields.itemName)
-		val itemId = new NullableIntFieldValue(self, FullCart.fields.itemId)
-		val itemType = new NullableStringFieldValue(self, FullCart.fields.itemType)
-		val nameFirst = new NullableStringFieldValue(self, FullCart.fields.nameFirst)
-		val nameLast = new NullableStringFieldValue(self, FullCart.fields.nameLast)
-		val price = new NullableDoubleFieldValue(self, FullCart.fields.price)
-		val displayOrder = new NullableDoubleFieldValue(self, FullCart.fields.displayOrder)
-		val orderId = new NullableIntFieldValue(self, FullCart.fields.orderId)
-		val fundId = new NullableIntFieldValue(self, FullCart.fields.fundId)
-	}
-}
-
-object FullCart extends StorableObject[FullCart] {
-	val entityName: String = "FULL_CART"
-
-	object fields extends FieldsObject {
-		val itemName = new NullableStringDatabaseField(self, "ITEM_NAME", 227)
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val itemType = new NullableStringDatabaseField(self, "ITEM_TYPE", 25)
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 200)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 200)
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val fundId = new NullableIntDatabaseField(self, "FUND_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/FyExpiration.scala b/entity-templates/FyExpiration.scala
deleted file mode 100644
index eedcf6e1..00000000
--- a/entity-templates/FyExpiration.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class FyExpiration extends StorableClass(FyExpiration) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, FyExpiration.fields.personId)
-		val assignId = new NullableIntFieldValue(self, FyExpiration.fields.assignId)
-	}
-}
-
-object FyExpiration extends StorableObject[FyExpiration] {
-	val entityName: String = "FY_EXPIRATIONS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val assignId = new NullableIntDatabaseField(self, "ASSIGN_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertCurrentState.scala b/entity-templates/GiftCertCurrentState.scala
deleted file mode 100644
index 5c0f6035..00000000
--- a/entity-templates/GiftCertCurrentState.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertCurrentState extends StorableClass(GiftCertCurrentState) {
-	object values extends ValuesObject {
-		val stateId = new IntFieldValue(self, GiftCertCurrentState.fields.stateId)
-		val certId = new NullableIntFieldValue(self, GiftCertCurrentState.fields.certId)
-		val stateDate = new NullableLocalDateTimeFieldValue(self, GiftCertCurrentState.fields.stateDate)
-		val ownerPersonId = new NullableIntFieldValue(self, GiftCertCurrentState.fields.ownerPersonId)
-		val membershipTypeId = new NullableIntFieldValue(self, GiftCertCurrentState.fields.membershipTypeId)
-		val value = new NullableDoubleFieldValue(self, GiftCertCurrentState.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GiftCertCurrentState.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GiftCertCurrentState.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GiftCertCurrentState.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GiftCertCurrentState.fields.updatedBy)
-	}
-}
-
-object GiftCertCurrentState extends StorableObject[GiftCertCurrentState] {
-	val entityName: String = "GIFT_CERT_CURRENT_STATES"
-
-	object fields extends FieldsObject {
-		val stateId = new IntDatabaseField(self, "STATE_ID")
-		val certId = new NullableIntDatabaseField(self, "CERT_ID")
-		val stateDate = new NullableLocalDateTimeDatabaseField(self, "STATE_DATE")
-		val ownerPersonId = new NullableIntDatabaseField(self, "OWNER_PERSON_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val value = new NullableDoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertPurchase.scala b/entity-templates/GiftCertPurchase.scala
deleted file mode 100644
index 251ff953..00000000
--- a/entity-templates/GiftCertPurchase.scala
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertPurchase extends StorableClass(GiftCertPurchase) {
-	object values extends ValuesObject {
-		val certId = new NullableIntFieldValue(self, GiftCertPurchase.fields.certId)
-		val purchaseDate = new NullableLocalDateTimeFieldValue(self, GiftCertPurchase.fields.purchaseDate)
-		val purchasePrice = new NullableDoubleFieldValue(self, GiftCertPurchase.fields.purchasePrice)
-		val purchaseCloseId = new NullableIntFieldValue(self, GiftCertPurchase.fields.purchaseCloseId)
-		val purchaseOrderId = new NullableIntFieldValue(self, GiftCertPurchase.fields.purchaseOrderId)
-		val purchaseMemTypeId = new NullableIntFieldValue(self, GiftCertPurchase.fields.purchaseMemTypeId)
-		val recipientNameFirst = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientNameFirst)
-		val recipientNameLast = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientNameLast)
-		val recipientEmail = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientEmail)
-		val recipientAddr1 = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientAddr1)
-		val recipientAddr2 = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientAddr2)
-		val recipientCity = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientCity)
-		val recipientState = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientState)
-		val recipientZip = new NullableStringFieldValue(self, GiftCertPurchase.fields.recipientZip)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GiftCertPurchase.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GiftCertPurchase.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GiftCertPurchase.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GiftCertPurchase.fields.updatedBy)
-		val foMadeDatetime = new NullableLocalDateTimeFieldValue(self, GiftCertPurchase.fields.foMadeDatetime)
-		val purchaserId = new NullableIntFieldValue(self, GiftCertPurchase.fields.purchaserId)
-		val deliveryMethod = new BooleanFIeldValue(self, GiftCertPurchase.fields.deliveryMethod)
-		val message = new NullableUnknownFieldType(self, GiftCertPurchase.fields.message)
-		val purchaseId = new IntFieldValue(self, GiftCertPurchase.fields.purchaseId)
-		val whoseAddr = new NullableBooleanFIeldValue(self, GiftCertPurchase.fields.whoseAddr)
-		val expirationDate = new LocalDateTimeFieldValue(self, GiftCertPurchase.fields.expirationDate)
-		val purchaseValue = new NullableDoubleFieldValue(self, GiftCertPurchase.fields.purchaseValue)
-		val discountInstanceId = new NullableIntFieldValue(self, GiftCertPurchase.fields.discountInstanceId)
-		val soldBy = new NullableStringFieldValue(self, GiftCertPurchase.fields.soldBy)
-		val foMadeBy = new NullableStringFieldValue(self, GiftCertPurchase.fields.foMadeBy)
-		val whoseEmail = new NullableBooleanFIeldValue(self, GiftCertPurchase.fields.whoseEmail)
-		val voidCloseId = new NullableIntFieldValue(self, GiftCertPurchase.fields.voidCloseId)
-		val discountAmt = new NullableDoubleFieldValue(self, GiftCertPurchase.fields.discountAmt)
-	}
-}
-
-object GiftCertPurchase extends StorableObject[GiftCertPurchase] {
-	val entityName: String = "GIFT_CERT_PURCHASES"
-
-	object fields extends FieldsObject {
-		val certId = new NullableIntDatabaseField(self, "CERT_ID")
-		val purchaseDate = new NullableLocalDateTimeDatabaseField(self, "PURCHASE_DATE")
-		val purchasePrice = new NullableDoubleDatabaseField(self, "PURCHASE_PRICE")
-		val purchaseCloseId = new NullableIntDatabaseField(self, "PURCHASE_CLOSE_ID")
-		val purchaseOrderId = new NullableIntDatabaseField(self, "PURCHASE_ORDER_ID")
-		val purchaseMemTypeId = new NullableIntDatabaseField(self, "PURCHASE_MEM_TYPE_ID")
-		val recipientNameFirst = new NullableStringDatabaseField(self, "RECIPIENT_NAME_FIRST", 100)
-		val recipientNameLast = new NullableStringDatabaseField(self, "RECIPIENT_NAME_LAST", 100)
-		val recipientEmail = new NullableStringDatabaseField(self, "RECIPIENT_EMAIL", 500)
-		val recipientAddr1 = new NullableStringDatabaseField(self, "RECIPIENT_ADDR_1", 100)
-		val recipientAddr2 = new NullableStringDatabaseField(self, "RECIPIENT_ADDR_2", 100)
-		val recipientCity = new NullableStringDatabaseField(self, "RECIPIENT_CITY", 50)
-		val recipientState = new NullableStringDatabaseField(self, "RECIPIENT_STATE", 5)
-		val recipientZip = new NullableStringDatabaseField(self, "RECIPIENT_ZIP", 20)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val foMadeDatetime = new NullableLocalDateTimeDatabaseField(self, "FO_MADE_DATETIME")
-		val purchaserId = new NullableIntDatabaseField(self, "PURCHASER_ID")
-		val deliveryMethod = new BooleanDatabaseField(self, "DELIVERY_METHOD")
-		val message = new NullableUnknownFieldType(self, "MESSAGE")
-		val purchaseId = new IntDatabaseField(self, "PURCHASE_ID")
-		val whoseAddr = new NullableBooleanDatabaseField(self, "WHOSE_ADDR")
-		val expirationDate = new LocalDateTimeDatabaseField(self, "EXPIRATION_DATE")
-		val purchaseValue = new NullableDoubleDatabaseField(self, "PURCHASE_VALUE")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val soldBy = new NullableStringDatabaseField(self, "SOLD_BY", 50)
-		val foMadeBy = new NullableStringDatabaseField(self, "FO_MADE_BY", 50)
-		val whoseEmail = new NullableBooleanDatabaseField(self, "WHOSE_EMAIL")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.purchaseId
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertState.scala b/entity-templates/GiftCertState.scala
deleted file mode 100644
index 997b4fd4..00000000
--- a/entity-templates/GiftCertState.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertState extends StorableClass(GiftCertState) {
-	object values extends ValuesObject {
-		val stateId = new IntFieldValue(self, GiftCertState.fields.stateId)
-		val certId = new NullableIntFieldValue(self, GiftCertState.fields.certId)
-		val stateDate = new NullableLocalDateTimeFieldValue(self, GiftCertState.fields.stateDate)
-		val ownerPersonId = new NullableIntFieldValue(self, GiftCertState.fields.ownerPersonId)
-		val membershipTypeId = new NullableIntFieldValue(self, GiftCertState.fields.membershipTypeId)
-		val value = new NullableDoubleFieldValue(self, GiftCertState.fields.value)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GiftCertState.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GiftCertState.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GiftCertState.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GiftCertState.fields.updatedBy)
-	}
-}
-
-object GiftCertState extends StorableObject[GiftCertState] {
-	val entityName: String = "GIFT_CERT_STATES"
-
-	object fields extends FieldsObject {
-		val stateId = new IntDatabaseField(self, "STATE_ID")
-		val certId = new NullableIntDatabaseField(self, "CERT_ID")
-		val stateDate = new NullableLocalDateTimeDatabaseField(self, "STATE_DATE")
-		val ownerPersonId = new NullableIntDatabaseField(self, "OWNER_PERSON_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val value = new NullableDoubleDatabaseField(self, "VALUE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.stateId
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertificate.scala b/entity-templates/GiftCertificate.scala
deleted file mode 100644
index e548a570..00000000
--- a/entity-templates/GiftCertificate.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertificate extends StorableClass(GiftCertificate) {
-	object values extends ValuesObject {
-		val certId = new IntFieldValue(self, GiftCertificate.fields.certId)
-		val certNumber = new StringFieldValue(self, GiftCertificate.fields.certNumber)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GiftCertificate.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GiftCertificate.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GiftCertificate.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GiftCertificate.fields.updatedBy)
-		val redemptionHash = new NullableStringFieldValue(self, GiftCertificate.fields.redemptionHash)
-		val redemptionCode = new NullableStringFieldValue(self, GiftCertificate.fields.redemptionCode)
-	}
-}
-
-object GiftCertificate extends StorableObject[GiftCertificate] {
-	val entityName: String = "GIFT_CERTIFICATES"
-
-	object fields extends FieldsObject {
-		val certId = new IntDatabaseField(self, "CERT_ID")
-		val certNumber = new StringDatabaseField(self, "CERT_NUMBER", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val redemptionHash = new NullableStringDatabaseField(self, "REDEMPTION_HASH", 50)
-		val redemptionCode = new NullableStringDatabaseField(self, "REDEMPTION_CODE", 20)
-	}
-
-	def primaryKey: IntDatabaseField = fields.certId
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertsActiveDiscount.scala b/entity-templates/GiftCertsActiveDiscount.scala
deleted file mode 100644
index 0d1fde93..00000000
--- a/entity-templates/GiftCertsActiveDiscount.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertsActiveDiscount extends StorableClass(GiftCertsActiveDiscount) {
-	object values extends ValuesObject {
-		val typeId = new NullableIntFieldValue(self, GiftCertsActiveDiscount.fields.typeId)
-		val instanceId = new IntFieldValue(self, GiftCertsActiveDiscount.fields.instanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, GiftCertsActiveDiscount.fields.discountAmt)
-	}
-}
-
-object GiftCertsActiveDiscount extends StorableObject[GiftCertsActiveDiscount] {
-	val entityName: String = "GIFT_CERTS_ACTIVE_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertsAvailableDiscount.scala b/entity-templates/GiftCertsAvailableDiscount.scala
deleted file mode 100644
index 35bd1386..00000000
--- a/entity-templates/GiftCertsAvailableDiscount.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertsAvailableDiscount extends StorableClass(GiftCertsAvailableDiscount) {
-	object values extends ValuesObject {
-		val typeId = new NullableIntFieldValue(self, GiftCertsAvailableDiscount.fields.typeId)
-		val instanceId = new IntFieldValue(self, GiftCertsAvailableDiscount.fields.instanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, GiftCertsAvailableDiscount.fields.discountAmt)
-	}
-}
-
-object GiftCertsAvailableDiscount extends StorableObject[GiftCertsAvailableDiscount] {
-	val entityName: String = "GIFT_CERTS_AVAILABLE_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/GiftCertsDiscount.scala b/entity-templates/GiftCertsDiscount.scala
deleted file mode 100644
index 26b3b803..00000000
--- a/entity-templates/GiftCertsDiscount.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GiftCertsDiscount extends StorableClass(GiftCertsDiscount) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, GiftCertsDiscount.fields.assignId)
-		val typeId = new NullableIntFieldValue(self, GiftCertsDiscount.fields.typeId)
-		val instanceId = new IntFieldValue(self, GiftCertsDiscount.fields.instanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, GiftCertsDiscount.fields.discountAmt)
-		val availableOnline = new NullableBooleanFIeldValue(self, GiftCertsDiscount.fields.availableOnline)
-		val fixedCostThreshold = new NullableDoubleFieldValue(self, GiftCertsDiscount.fields.fixedCostThreshold)
-		val limit = new NullableDoubleFieldValue(self, GiftCertsDiscount.fields.limit)
-	}
-}
-
-object GiftCertsDiscount extends StorableObject[GiftCertsDiscount] {
-	val entityName: String = "GIFT_CERTS_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val availableOnline = new NullableBooleanDatabaseField(self, "AVAILABLE_ONLINE")
-		val fixedCostThreshold = new NullableDoubleDatabaseField(self, "FIXED_COST_THRESHOLD")
-		val limit = new NullableDoubleDatabaseField(self, "LIMIT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/GlobalConstant.scala b/entity-templates/GlobalConstant.scala
deleted file mode 100644
index d80a860d..00000000
--- a/entity-templates/GlobalConstant.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GlobalConstant extends StorableClass(GlobalConstant) {
-	object values extends ValuesObject {
-		val constantId = new IntFieldValue(self, GlobalConstant.fields.constantId)
-		val constantName = new StringFieldValue(self, GlobalConstant.fields.constantName)
-		val dataType = new DoubleFieldValue(self, GlobalConstant.fields.dataType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GlobalConstant.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GlobalConstant.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GlobalConstant.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GlobalConstant.fields.updatedBy)
-	}
-}
-
-object GlobalConstant extends StorableObject[GlobalConstant] {
-	val entityName: String = "GLOBAL_CONSTANTS"
-
-	object fields extends FieldsObject {
-		val constantId = new IntDatabaseField(self, "CONSTANT_ID")
-		val constantName = new StringDatabaseField(self, "CONSTANT_NAME", 100)
-		val dataType = new DoubleDatabaseField(self, "DATA_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.constantId
-}
\ No newline at end of file
diff --git a/entity-templates/GlobalConstantDataType.scala b/entity-templates/GlobalConstantDataType.scala
deleted file mode 100644
index d61fcea6..00000000
--- a/entity-templates/GlobalConstantDataType.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GlobalConstantDataType extends StorableClass(GlobalConstantDataType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, GlobalConstantDataType.fields.typeId)
-		val typeName = new NullableStringFieldValue(self, GlobalConstantDataType.fields.typeName)
-	}
-}
-
-object GlobalConstantDataType extends StorableObject[GlobalConstantDataType] {
-	val entityName: String = "GLOBAL_CONSTANT_DATA_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new NullableStringDatabaseField(self, "TYPE_NAME", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/GlobalConstantsValue.scala b/entity-templates/GlobalConstantsValue.scala
deleted file mode 100644
index 1169551b..00000000
--- a/entity-templates/GlobalConstantsValue.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GlobalConstantsValue extends StorableClass(GlobalConstantsValue) {
-	object values extends ValuesObject {
-		val valueId = new IntFieldValue(self, GlobalConstantsValue.fields.valueId)
-		val constantId = new NullableIntFieldValue(self, GlobalConstantsValue.fields.constantId)
-		val effectiveDatetime = new NullableLocalDateTimeFieldValue(self, GlobalConstantsValue.fields.effectiveDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GlobalConstantsValue.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GlobalConstantsValue.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GlobalConstantsValue.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GlobalConstantsValue.fields.updatedBy)
-		val valueNumber = new NullableDoubleFieldValue(self, GlobalConstantsValue.fields.valueNumber)
-		val valueDate = new NullableLocalDateTimeFieldValue(self, GlobalConstantsValue.fields.valueDate)
-	}
-}
-
-object GlobalConstantsValue extends StorableObject[GlobalConstantsValue] {
-	val entityName: String = "GLOBAL_CONSTANTS_VALUES"
-
-	object fields extends FieldsObject {
-		val valueId = new IntDatabaseField(self, "VALUE_ID")
-		val constantId = new NullableIntDatabaseField(self, "CONSTANT_ID")
-		val effectiveDatetime = new NullableLocalDateTimeDatabaseField(self, "EFFECTIVE_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val valueNumber = new NullableDoubleDatabaseField(self, "VALUE_NUMBER")
-		val valueDate = new NullableLocalDateTimeDatabaseField(self, "VALUE_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.valueId
-}
\ No newline at end of file
diff --git a/entity-templates/GuestPriv.scala b/entity-templates/GuestPriv.scala
deleted file mode 100644
index 35c138ca..00000000
--- a/entity-templates/GuestPriv.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class GuestPriv extends StorableClass(GuestPriv) {
-	object values extends ValuesObject {
-		val orderId = new NullableIntFieldValue(self, GuestPriv.fields.orderId)
-		val price = new NullableDoubleFieldValue(self, GuestPriv.fields.price)
-		val purchaseDate = new NullableLocalDateTimeFieldValue(self, GuestPriv.fields.purchaseDate)
-		val startDate = new NullableLocalDateTimeFieldValue(self, GuestPriv.fields.startDate)
-		val closeId = new NullableIntFieldValue(self, GuestPriv.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, GuestPriv.fields.voidCloseId)
-		val paymentLocation = new NullableStringFieldValue(self, GuestPriv.fields.paymentLocation)
-		val paymentMedium = new NullableStringFieldValue(self, GuestPriv.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, GuestPriv.fields.ccTransNum)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, GuestPriv.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, GuestPriv.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, GuestPriv.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, GuestPriv.fields.updatedBy)
-		val membershipId = new IntFieldValue(self, GuestPriv.fields.membershipId)
-	}
-}
-
-object GuestPriv extends StorableObject[GuestPriv] {
-	val entityName: String = "GUEST_PRIVS"
-
-	object fields extends FieldsObject {
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val purchaseDate = new NullableLocalDateTimeDatabaseField(self, "PURCHASE_DATE")
-		val startDate = new NullableLocalDateTimeDatabaseField(self, "START_DATE")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val paymentLocation = new NullableStringDatabaseField(self, "PAYMENT_LOCATION", 50)
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 50)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val membershipId = new IntDatabaseField(self, "MEMBERSHIP_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.membershipId
-}
\ No newline at end of file
diff --git a/entity-templates/HighSchool.scala b/entity-templates/HighSchool.scala
deleted file mode 100644
index c892e097..00000000
--- a/entity-templates/HighSchool.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class HighSchool extends StorableClass(HighSchool) {
-	object values extends ValuesObject {
-		val schoolId = new IntFieldValue(self, HighSchool.fields.schoolId)
-		val schoolName = new NullableStringFieldValue(self, HighSchool.fields.schoolName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, HighSchool.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, HighSchool.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, HighSchool.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, HighSchool.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, HighSchool.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, HighSchool.fields.displayOrder)
-	}
-}
-
-object HighSchool extends StorableObject[HighSchool] {
-	val entityName: String = "HIGH_SCHOOLS"
-
-	object fields extends FieldsObject {
-		val schoolId = new IntDatabaseField(self, "SCHOOL_ID")
-		val schoolName = new NullableStringDatabaseField(self, "SCHOOL_NAME", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.schoolId
-}
\ No newline at end of file
diff --git a/entity-templates/HighSchoolFee.scala b/entity-templates/HighSchoolFee.scala
deleted file mode 100644
index 6e6e48dc..00000000
--- a/entity-templates/HighSchoolFee.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class HighSchoolFee extends StorableClass(HighSchoolFee) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, HighSchoolFee.fields.rowId)
-		val schoolId = new IntFieldValue(self, HighSchoolFee.fields.schoolId)
-		val year = new DoubleFieldValue(self, HighSchoolFee.fields.year)
-		val springFall = new BooleanFIeldValue(self, HighSchoolFee.fields.springFall)
-		val amount = new NullableDoubleFieldValue(self, HighSchoolFee.fields.amount)
-		val closeId = new NullableIntFieldValue(self, HighSchoolFee.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, HighSchoolFee.fields.voidCloseId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, HighSchoolFee.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, HighSchoolFee.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, HighSchoolFee.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, HighSchoolFee.fields.updatedBy)
-	}
-}
-
-object HighSchoolFee extends StorableObject[HighSchoolFee] {
-	val entityName: String = "HIGH_SCHOOL_FEES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val schoolId = new IntDatabaseField(self, "SCHOOL_ID")
-		val year = new DoubleDatabaseField(self, "YEAR")
-		val springFall = new BooleanDatabaseField(self, "SPRING_FALL")
-		val amount = new NullableDoubleDatabaseField(self, "AMOUNT")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 50)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/HighSchoolPayment.scala b/entity-templates/HighSchoolPayment.scala
deleted file mode 100644
index e4dbab3e..00000000
--- a/entity-templates/HighSchoolPayment.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class HighSchoolPayment extends StorableClass(HighSchoolPayment) {
-	object values extends ValuesObject {
-		val paymentId = new IntFieldValue(self, HighSchoolPayment.fields.paymentId)
-		val schoolId = new IntFieldValue(self, HighSchoolPayment.fields.schoolId)
-		val amount = new DoubleFieldValue(self, HighSchoolPayment.fields.amount)
-		val closeId = new IntFieldValue(self, HighSchoolPayment.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, HighSchoolPayment.fields.voidCloseId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, HighSchoolPayment.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, HighSchoolPayment.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, HighSchoolPayment.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, HighSchoolPayment.fields.updatedBy)
-		val paymentMedium = new NullableStringFieldValue(self, HighSchoolPayment.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, HighSchoolPayment.fields.ccTransNum)
-		val year = new DoubleFieldValue(self, HighSchoolPayment.fields.year)
-		val springFall = new BooleanFIeldValue(self, HighSchoolPayment.fields.springFall)
-		val checkId = new NullableIntFieldValue(self, HighSchoolPayment.fields.checkId)
-	}
-}
-
-object HighSchoolPayment extends StorableObject[HighSchoolPayment] {
-	val entityName: String = "HIGH_SCHOOL_PAYMENTS"
-
-	object fields extends FieldsObject {
-		val paymentId = new IntDatabaseField(self, "PAYMENT_ID")
-		val schoolId = new IntDatabaseField(self, "SCHOOL_ID")
-		val amount = new DoubleDatabaseField(self, "AMOUNT")
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 50)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 50)
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 50)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val year = new DoubleDatabaseField(self, "YEAR")
-		val springFall = new BooleanDatabaseField(self, "SPRING_FALL")
-		val checkId = new NullableIntDatabaseField(self, "CHECK_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.paymentId
-}
\ No newline at end of file
diff --git a/entity-templates/HtmldbPlanTable.scala b/entity-templates/HtmldbPlanTable.scala
deleted file mode 100644
index c9cc00d2..00000000
--- a/entity-templates/HtmldbPlanTable.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class HtmldbPlanTable extends StorableClass(HtmldbPlanTable) {
-	object values extends ValuesObject {
-		val statementId = new NullableStringFieldValue(self, HtmldbPlanTable.fields.statementId)
-		val planId = new NullableIntFieldValue(self, HtmldbPlanTable.fields.planId)
-		val timestamp = new NullableLocalDateTimeFieldValue(self, HtmldbPlanTable.fields.timestamp)
-		val remarks = new NullableStringFieldValue(self, HtmldbPlanTable.fields.remarks)
-		val operation = new NullableStringFieldValue(self, HtmldbPlanTable.fields.operation)
-		val options = new NullableStringFieldValue(self, HtmldbPlanTable.fields.options)
-		val objectNode = new NullableStringFieldValue(self, HtmldbPlanTable.fields.objectNode)
-		val objectOwner = new NullableStringFieldValue(self, HtmldbPlanTable.fields.objectOwner)
-		val objectName = new NullableStringFieldValue(self, HtmldbPlanTable.fields.objectName)
-		val objectAlias = new NullableStringFieldValue(self, HtmldbPlanTable.fields.objectAlias)
-		val objectInstance = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.objectInstance)
-		val objectType = new NullableStringFieldValue(self, HtmldbPlanTable.fields.objectType)
-		val optimizer = new NullableStringFieldValue(self, HtmldbPlanTable.fields.optimizer)
-		val searchColumns = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.searchColumns)
-		val id = new NullableIntFieldValue(self, HtmldbPlanTable.fields.id)
-		val parentId = new NullableIntFieldValue(self, HtmldbPlanTable.fields.parentId)
-		val depth = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.depth)
-		val position = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.position)
-		val cost = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.cost)
-		val cardinality = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.cardinality)
-		val bytes = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.bytes)
-		val otherTag = new NullableStringFieldValue(self, HtmldbPlanTable.fields.otherTag)
-		val partitionStart = new NullableStringFieldValue(self, HtmldbPlanTable.fields.partitionStart)
-		val partitionStop = new NullableStringFieldValue(self, HtmldbPlanTable.fields.partitionStop)
-		val partitionId = new NullableIntFieldValue(self, HtmldbPlanTable.fields.partitionId)
-		val other = new NullableUnknownFieldType(self, HtmldbPlanTable.fields.other)
-		val distribution = new NullableStringFieldValue(self, HtmldbPlanTable.fields.distribution)
-		val cpuCost = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.cpuCost)
-		val ioCost = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.ioCost)
-		val tempSpace = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.tempSpace)
-		val accessPredicates = new NullableStringFieldValue(self, HtmldbPlanTable.fields.accessPredicates)
-		val filterPredicates = new NullableStringFieldValue(self, HtmldbPlanTable.fields.filterPredicates)
-		val projection = new NullableStringFieldValue(self, HtmldbPlanTable.fields.projection)
-		val time = new NullableDoubleFieldValue(self, HtmldbPlanTable.fields.time)
-		val qblockName = new NullableStringFieldValue(self, HtmldbPlanTable.fields.qblockName)
-	}
-}
-
-object HtmldbPlanTable extends StorableObject[HtmldbPlanTable] {
-	val entityName: String = "HTMLDB_PLAN_TABLE"
-
-	object fields extends FieldsObject {
-		val statementId = new NullableStringDatabaseField(self, "STATEMENT_ID", 30)
-		val planId = new NullableIntDatabaseField(self, "PLAN_ID")
-		val timestamp = new NullableLocalDateTimeDatabaseField(self, "TIMESTAMP")
-		val remarks = new NullableStringDatabaseField(self, "REMARKS", 4000)
-		val operation = new NullableStringDatabaseField(self, "OPERATION", 30)
-		val options = new NullableStringDatabaseField(self, "OPTIONS", 255)
-		val objectNode = new NullableStringDatabaseField(self, "OBJECT_NODE", 128)
-		val objectOwner = new NullableStringDatabaseField(self, "OBJECT_OWNER", 128)
-		val objectName = new NullableStringDatabaseField(self, "OBJECT_NAME", 128)
-		val objectAlias = new NullableStringDatabaseField(self, "OBJECT_ALIAS", 261)
-		val objectInstance = new NullableDoubleDatabaseField(self, "OBJECT_INSTANCE")
-		val objectType = new NullableStringDatabaseField(self, "OBJECT_TYPE", 128)
-		val optimizer = new NullableStringDatabaseField(self, "OPTIMIZER", 255)
-		val searchColumns = new NullableDoubleDatabaseField(self, "SEARCH_COLUMNS")
-		val id = new NullableIntDatabaseField(self, "ID")
-		val parentId = new NullableIntDatabaseField(self, "PARENT_ID")
-		val depth = new NullableDoubleDatabaseField(self, "DEPTH")
-		val position = new NullableDoubleDatabaseField(self, "POSITION")
-		val cost = new NullableDoubleDatabaseField(self, "COST")
-		val cardinality = new NullableDoubleDatabaseField(self, "CARDINALITY")
-		val bytes = new NullableDoubleDatabaseField(self, "BYTES")
-		val otherTag = new NullableStringDatabaseField(self, "OTHER_TAG", 255)
-		val partitionStart = new NullableStringDatabaseField(self, "PARTITION_START", 255)
-		val partitionStop = new NullableStringDatabaseField(self, "PARTITION_STOP", 255)
-		val partitionId = new NullableIntDatabaseField(self, "PARTITION_ID")
-		val other = new NullableUnknownFieldType(self, "OTHER")
-		val distribution = new NullableStringDatabaseField(self, "DISTRIBUTION", 30)
-		val cpuCost = new NullableDoubleDatabaseField(self, "CPU_COST")
-		val ioCost = new NullableDoubleDatabaseField(self, "IO_COST")
-		val tempSpace = new NullableDoubleDatabaseField(self, "TEMP_SPACE")
-		val accessPredicates = new NullableStringDatabaseField(self, "ACCESS_PREDICATES", 4000)
-		val filterPredicates = new NullableStringDatabaseField(self, "FILTER_PREDICATES", 4000)
-		val projection = new NullableStringDatabaseField(self, "PROJECTION", 4000)
-		val time = new NullableDoubleDatabaseField(self, "TIME")
-		val qblockName = new NullableStringDatabaseField(self, "QBLOCK_NAME", 128)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/IncomeLevel.scala b/entity-templates/IncomeLevel.scala
deleted file mode 100644
index 972e3b84..00000000
--- a/entity-templates/IncomeLevel.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class IncomeLevel extends StorableClass(IncomeLevel) {
-	object values extends ValuesObject {
-		val levelId = new IntFieldValue(self, IncomeLevel.fields.levelId)
-		val levelFloor = new NullableDoubleFieldValue(self, IncomeLevel.fields.levelFloor)
-		val levelCeiling = new NullableDoubleFieldValue(self, IncomeLevel.fields.levelCeiling)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, IncomeLevel.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, IncomeLevel.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, IncomeLevel.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, IncomeLevel.fields.updatedBy)
-	}
-}
-
-object IncomeLevel extends StorableObject[IncomeLevel] {
-	val entityName: String = "INCOME_LEVELS"
-
-	object fields extends FieldsObject {
-		val levelId = new IntDatabaseField(self, "LEVEL_ID")
-		val levelFloor = new NullableDoubleDatabaseField(self, "LEVEL_FLOOR")
-		val levelCeiling = new NullableDoubleDatabaseField(self, "LEVEL_CEILING")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.levelId
-}
\ No newline at end of file
diff --git a/entity-templates/IndiegogoDonation.scala b/entity-templates/IndiegogoDonation.scala
deleted file mode 100644
index d2498f7a..00000000
--- a/entity-templates/IndiegogoDonation.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class IndiegogoDonation extends StorableClass(IndiegogoDonation) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, IndiegogoDonation.fields.id)
-		val perkId = new NullableStringFieldValue(self, IndiegogoDonation.fields.perkId)
-		val pledgeId = new NullableIntFieldValue(self, IndiegogoDonation.fields.pledgeId)
-		val fulfillmentStatus = new NullableStringFieldValue(self, IndiegogoDonation.fields.fulfillmentStatus)
-		val fundingDate = new NullableStringFieldValue(self, IndiegogoDonation.fields.fundingDate)
-		val paymentMethod = new NullableStringFieldValue(self, IndiegogoDonation.fields.paymentMethod)
-		val appearance = new NullableStringFieldValue(self, IndiegogoDonation.fields.appearance)
-		val name = new NullableStringFieldValue(self, IndiegogoDonation.fields.name)
-		val email = new NullableStringFieldValue(self, IndiegogoDonation.fields.email)
-		val amount = new NullableStringFieldValue(self, IndiegogoDonation.fields.amount)
-		val perk = new NullableStringFieldValue(self, IndiegogoDonation.fields.perk)
-		val shippingName = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingName)
-		val shippingAddress = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingAddress)
-		val shippingAddress2 = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingAddress2)
-		val shippingCity = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingCity)
-		val shippingStateprovince = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingStateprovince)
-		val shippingZippostalCode = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingZippostalCode)
-		val shippingCountry = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingCountry)
-		val amountNumeric = new NullableDoubleFieldValue(self, IndiegogoDonation.fields.amountNumeric)
-		val instance = new DoubleFieldValue(self, IndiegogoDonation.fields.instance)
-	}
-}
-
-object IndiegogoDonation extends StorableObject[IndiegogoDonation] {
-	val entityName: String = "INDIEGOGO_DONATIONS"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val perkId = new NullableStringDatabaseField(self, "PERK_ID", 30)
-		val pledgeId = new NullableIntDatabaseField(self, "PLEDGE_ID")
-		val fulfillmentStatus = new NullableStringDatabaseField(self, "FULFILLMENT_STATUS", 60)
-		val fundingDate = new NullableStringDatabaseField(self, "FUNDING_DATE", 30)
-		val paymentMethod = new NullableStringDatabaseField(self, "PAYMENT_METHOD", 30)
-		val appearance = new NullableStringDatabaseField(self, "APPEARANCE", 30)
-		val name = new NullableStringDatabaseField(self, "NAME", 1)
-		val email = new NullableStringDatabaseField(self, "EMAIL", 255)
-		val amount = new NullableStringDatabaseField(self, "AMOUNT", 30)
-		val perk = new NullableStringDatabaseField(self, "PERK", 255)
-		val shippingName = new NullableStringDatabaseField(self, "SHIPPING_NAME", 30)
-		val shippingAddress = new NullableStringDatabaseField(self, "SHIPPING_ADDRESS", 255)
-		val shippingAddress2 = new NullableStringDatabaseField(self, "SHIPPING_ADDRESS_2", 30)
-		val shippingCity = new NullableStringDatabaseField(self, "SHIPPING_CITY", 30)
-		val shippingStateprovince = new NullableStringDatabaseField(self, "SHIPPING_STATEPROVINCE", 30)
-		val shippingZippostalCode = new NullableStringDatabaseField(self, "SHIPPING_ZIPPOSTAL_CODE", 30)
-		val shippingCountry = new NullableStringDatabaseField(self, "SHIPPING_COUNTRY", 30)
-		val amountNumeric = new NullableDoubleDatabaseField(self, "AMOUNT_NUMERIC")
-		val instance = new DoubleDatabaseField(self, "INSTANCE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/InstallmentSale.scala b/entity-templates/InstallmentSale.scala
deleted file mode 100644
index 755b2bd6..00000000
--- a/entity-templates/InstallmentSale.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class InstallmentSale extends StorableClass(InstallmentSale) {
-	object values extends ValuesObject {
-		val saleId = new IntFieldValue(self, InstallmentSale.fields.saleId)
-		val amountInCents = new DoubleFieldValue(self, InstallmentSale.fields.amountInCents)
-		val staggerId = new IntFieldValue(self, InstallmentSale.fields.staggerId)
-		val closeId = new IntFieldValue(self, InstallmentSale.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, InstallmentSale.fields.voidCloseId)
-	}
-}
-
-object InstallmentSale extends StorableObject[InstallmentSale] {
-	val entityName: String = "INSTALLMENT_SALES"
-
-	object fields extends FieldsObject {
-		val saleId = new IntDatabaseField(self, "SALE_ID")
-		val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val staggerId = new IntDatabaseField(self, "STAGGER_ID")
-		val closeId = new IntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.saleId
-}
\ No newline at end of file
diff --git a/entity-templates/InstructionQueue.scala b/entity-templates/InstructionQueue.scala
deleted file mode 100644
index c9e3c425..00000000
--- a/entity-templates/InstructionQueue.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class InstructionQueue extends StorableClass(InstructionQueue) {
-	object values extends ValuesObject {
-		val instructionId = new IntFieldValue(self, InstructionQueue.fields.instructionId)
-		val cardNum = new StringFieldValue(self, InstructionQueue.fields.cardNum)
-		val signoutId = new NullableIntFieldValue(self, InstructionQueue.fields.signoutId)
-		val addedDatetime = new NullableLocalDateTimeFieldValue(self, InstructionQueue.fields.addedDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, InstructionQueue.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, InstructionQueue.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, InstructionQueue.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, InstructionQueue.fields.updatedBy)
-		val programId = new IntFieldValue(self, InstructionQueue.fields.programId)
-		val queueOrder = new NullableDoubleFieldValue(self, InstructionQueue.fields.queueOrder)
-		val personId = new IntFieldValue(self, InstructionQueue.fields.personId)
-		val startActive = new NullableLocalDateTimeFieldValue(self, InstructionQueue.fields.startActive)
-		val endActive = new NullableLocalDateTimeFieldValue(self, InstructionQueue.fields.endActive)
-	}
-}
-
-object InstructionQueue extends StorableObject[InstructionQueue] {
-	val entityName: String = "INSTRUCTION_QUEUE"
-
-	object fields extends FieldsObject {
-		val instructionId = new IntDatabaseField(self, "INSTRUCTION_ID")
-		val cardNum = new StringDatabaseField(self, "CARD_NUM", 50)
-		val signoutId = new NullableIntDatabaseField(self, "SIGNOUT_ID")
-		val addedDatetime = new NullableLocalDateTimeDatabaseField(self, "ADDED_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val queueOrder = new NullableDoubleDatabaseField(self, "QUEUE_ORDER")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val startActive = new NullableLocalDateTimeDatabaseField(self, "START_ACTIVE")
-		val endActive = new NullableLocalDateTimeDatabaseField(self, "END_ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.instructionId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassAttendance.scala b/entity-templates/JpClassAttendance.scala
deleted file mode 100644
index 898c471d..00000000
--- a/entity-templates/JpClassAttendance.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassAttendance extends StorableClass(JpClassAttendance) {
-	object values extends ValuesObject {
-		val attendId = new IntFieldValue(self, JpClassAttendance.fields.attendId)
-		val sessionId = new IntFieldValue(self, JpClassAttendance.fields.sessionId)
-		val signupId = new IntFieldValue(self, JpClassAttendance.fields.signupId)
-		val attend = new NullableBooleanFIeldValue(self, JpClassAttendance.fields.attend)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassAttendance.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassAttendance.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassAttendance.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassAttendance.fields.updatedBy)
-	}
-}
-
-object JpClassAttendance extends StorableObject[JpClassAttendance] {
-	val entityName: String = "JP_CLASS_ATTENDANCE"
-
-	object fields extends FieldsObject {
-		val attendId = new IntDatabaseField(self, "ATTEND_ID")
-		val sessionId = new IntDatabaseField(self, "SESSION_ID")
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val attend = new NullableBooleanDatabaseField(self, "ATTEND")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.attendId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassBookend.scala b/entity-templates/JpClassBookend.scala
deleted file mode 100644
index a36c2a9c..00000000
--- a/entity-templates/JpClassBookend.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassBookend extends StorableClass(JpClassBookend) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, JpClassBookend.fields.instanceId)
-		val firstSession = new DoubleFieldValue(self, JpClassBookend.fields.firstSession)
-		val lastSession = new DoubleFieldValue(self, JpClassBookend.fields.lastSession)
-	}
-}
-
-object JpClassBookend extends StorableObject[JpClassBookend] {
-	val entityName: String = "JP_CLASS_BOOKENDS"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val firstSession = new DoubleDatabaseField(self, "FIRST_SESSION")
-		val lastSession = new DoubleDatabaseField(self, "LAST_SESSION")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassBookendsOld.scala b/entity-templates/JpClassBookendsOld.scala
deleted file mode 100644
index 6d333b52..00000000
--- a/entity-templates/JpClassBookendsOld.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassBookendsOld extends StorableClass(JpClassBookendsOld) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, JpClassBookendsOld.fields.instanceId)
-		val firstSession = new DoubleFieldValue(self, JpClassBookendsOld.fields.firstSession)
-		val lastSession = new DoubleFieldValue(self, JpClassBookendsOld.fields.lastSession)
-	}
-}
-
-object JpClassBookendsOld extends StorableObject[JpClassBookendsOld] {
-	val entityName: String = "JP_CLASS_BOOKENDS_OLD"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val firstSession = new DoubleDatabaseField(self, "FIRST_SESSION")
-		val lastSession = new DoubleDatabaseField(self, "LAST_SESSION")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassInstance.scala b/entity-templates/JpClassInstance.scala
deleted file mode 100644
index 3add881b..00000000
--- a/entity-templates/JpClassInstance.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassInstance extends StorableClass(JpClassInstance) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, JpClassInstance.fields.instanceId)
-		val typeId = new IntFieldValue(self, JpClassInstance.fields.typeId)
-		val limitOverride = new NullableDoubleFieldValue(self, JpClassInstance.fields.limitOverride)
-		val nameOverride = new NullableStringFieldValue(self, JpClassInstance.fields.nameOverride)
-		val maxAge = new NullableDoubleFieldValue(self, JpClassInstance.fields.maxAge)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassInstance.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassInstance.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassInstance.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassInstance.fields.updatedBy)
-		val minAge = new NullableDoubleFieldValue(self, JpClassInstance.fields.minAge)
-		val price = new NullableDoubleFieldValue(self, JpClassInstance.fields.price)
-		val regCodeRowId = new NullableIntFieldValue(self, JpClassInstance.fields.regCodeRowId)
-		val confirmTemplate = new NullableStringFieldValue(self, JpClassInstance.fields.confirmTemplate)
-		val adminHold = new NullableBooleanFIeldValue(self, JpClassInstance.fields.adminHold)
-		val locationId = new NullableIntFieldValue(self, JpClassInstance.fields.locationId)
-		val instructorId = new NullableIntFieldValue(self, JpClassInstance.fields.instructorId)
-		val reservedForGroup = new NullableBooleanFIeldValue(self, JpClassInstance.fields.reservedForGroup)
-		val overrideNoLimit = new NullableBooleanFIeldValue(self, JpClassInstance.fields.overrideNoLimit)
-	}
-}
-
-object JpClassInstance extends StorableObject[JpClassInstance] {
-	val entityName: String = "JP_CLASS_INSTANCES"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val limitOverride = new NullableDoubleDatabaseField(self, "LIMIT_OVERRIDE")
-		val nameOverride = new NullableStringDatabaseField(self, "NAME_OVERRIDE", 200)
-		val maxAge = new NullableDoubleDatabaseField(self, "MAX_AGE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val minAge = new NullableDoubleDatabaseField(self, "MIN_AGE")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-		val confirmTemplate = new NullableStringDatabaseField(self, "CONFIRM_TEMPLATE", 100)
-		val adminHold = new NullableBooleanDatabaseField(self, "ADMIN_HOLD")
-		val locationId = new NullableIntDatabaseField(self, "LOCATION_ID")
-		val instructorId = new NullableIntDatabaseField(self, "INSTRUCTOR_ID")
-		val reservedForGroup = new NullableBooleanDatabaseField(self, "RESERVED_FOR_GROUP")
-		val overrideNoLimit = new NullableBooleanDatabaseField(self, "OVERRIDE_NO_LIMIT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.instanceId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassLatestSkill.scala b/entity-templates/JpClassLatestSkill.scala
deleted file mode 100644
index ae9ca9fb..00000000
--- a/entity-templates/JpClassLatestSkill.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassLatestSkill extends StorableClass(JpClassLatestSkill) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, JpClassLatestSkill.fields.personId)
-		val typeId = new IntFieldValue(self, JpClassLatestSkill.fields.typeId)
-		val skillId = new NullableIntFieldValue(self, JpClassLatestSkill.fields.skillId)
-		val skillName = new StringFieldValue(self, JpClassLatestSkill.fields.skillName)
-		val ratingName = new StringFieldValue(self, JpClassLatestSkill.fields.ratingName)
-		val displayOrder = new NullableDoubleFieldValue(self, JpClassLatestSkill.fields.displayOrder)
-		val week = new NullableStringFieldValue(self, JpClassLatestSkill.fields.week)
-	}
-}
-
-object JpClassLatestSkill extends StorableObject[JpClassLatestSkill] {
-	val entityName: String = "JP_CLASS_LATEST_SKILLS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val skillId = new NullableIntDatabaseField(self, "SKILL_ID")
-		val skillName = new StringDatabaseField(self, "SKILL_NAME", 200)
-		val ratingName = new StringDatabaseField(self, "RATING_NAME", 50)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val week = new NullableStringDatabaseField(self, "WEEK", 45)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSection.scala b/entity-templates/JpClassSection.scala
deleted file mode 100644
index 84caf4af..00000000
--- a/entity-templates/JpClassSection.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSection extends StorableClass(JpClassSection) {
-	object values extends ValuesObject {
-		val sectionId = new IntFieldValue(self, JpClassSection.fields.sectionId)
-		val instanceId = new NullableIntFieldValue(self, JpClassSection.fields.instanceId)
-		val lookupId = new NullableIntFieldValue(self, JpClassSection.fields.lookupId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSection.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSection.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSection.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSection.fields.updatedBy)
-		val locationId = new NullableIntFieldValue(self, JpClassSection.fields.locationId)
-		val instructorId = new NullableIntFieldValue(self, JpClassSection.fields.instructorId)
-	}
-}
-
-object JpClassSection extends StorableObject[JpClassSection] {
-	val entityName: String = "JP_CLASS_SECTIONS"
-
-	object fields extends FieldsObject {
-		val sectionId = new IntDatabaseField(self, "SECTION_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val lookupId = new NullableIntDatabaseField(self, "LOOKUP_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val locationId = new NullableIntDatabaseField(self, "LOCATION_ID")
-		val instructorId = new NullableIntDatabaseField(self, "INSTRUCTOR_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.sectionId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSectionLookup.scala b/entity-templates/JpClassSectionLookup.scala
deleted file mode 100644
index 690bf343..00000000
--- a/entity-templates/JpClassSectionLookup.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSectionLookup extends StorableClass(JpClassSectionLookup) {
-	object values extends ValuesObject {
-		val sectionId = new IntFieldValue(self, JpClassSectionLookup.fields.sectionId)
-		val sectionName = new NullableStringFieldValue(self, JpClassSectionLookup.fields.sectionName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSectionLookup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSectionLookup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSectionLookup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSectionLookup.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, JpClassSectionLookup.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, JpClassSectionLookup.fields.displayOrder)
-		val svgUrl = new NullableStringFieldValue(self, JpClassSectionLookup.fields.svgUrl)
-	}
-}
-
-object JpClassSectionLookup extends StorableObject[JpClassSectionLookup] {
-	val entityName: String = "JP_CLASS_SECTION_LOOKUP"
-
-	object fields extends FieldsObject {
-		val sectionId = new IntDatabaseField(self, "SECTION_ID")
-		val sectionName = new NullableStringDatabaseField(self, "SECTION_NAME", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val svgUrl = new NullableStringDatabaseField(self, "SVG_URL", 100)
-	}
-
-	def primaryKey: IntDatabaseField = fields.sectionId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSession.scala b/entity-templates/JpClassSession.scala
deleted file mode 100644
index a0a8a99a..00000000
--- a/entity-templates/JpClassSession.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSession extends StorableClass(JpClassSession) {
-	object values extends ValuesObject {
-		val sessionId = new IntFieldValue(self, JpClassSession.fields.sessionId)
-		val instanceId = new IntFieldValue(self, JpClassSession.fields.instanceId)
-		val sessionDatetime = new LocalDateTimeFieldValue(self, JpClassSession.fields.sessionDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSession.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSession.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSession.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSession.fields.updatedBy)
-		val lengthOverride = new NullableDoubleFieldValue(self, JpClassSession.fields.lengthOverride)
-	}
-}
-
-object JpClassSession extends StorableObject[JpClassSession] {
-	val entityName: String = "JP_CLASS_SESSIONS"
-
-	object fields extends FieldsObject {
-		val sessionId = new IntDatabaseField(self, "SESSION_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val sessionDatetime = new LocalDateTimeDatabaseField(self, "SESSION_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val lengthOverride = new NullableDoubleDatabaseField(self, "LENGTH_OVERRIDE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.sessionId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSignup.scala b/entity-templates/JpClassSignup.scala
deleted file mode 100644
index c818658f..00000000
--- a/entity-templates/JpClassSignup.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSignup extends StorableClass(JpClassSignup) {
-	object values extends ValuesObject {
-		val signupId = new IntFieldValue(self, JpClassSignup.fields.signupId)
-		val instanceId = new IntFieldValue(self, JpClassSignup.fields.instanceId)
-		val personId = new IntFieldValue(self, JpClassSignup.fields.personId)
-		val signupDatetime = new NullableLocalDateTimeFieldValue(self, JpClassSignup.fields.signupDatetime)
-		val sequence = new NullableDoubleFieldValue(self, JpClassSignup.fields.sequence)
-		val signupType = new NullableBooleanFIeldValue(self, JpClassSignup.fields.signupType)
-		val groupId = new NullableIntFieldValue(self, JpClassSignup.fields.groupId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSignup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSignup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSignup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSignup.fields.updatedBy)
-		val isReserve = new NullableBooleanFIeldValue(self, JpClassSignup.fields.isReserve)
-		val orderId = new NullableIntFieldValue(self, JpClassSignup.fields.orderId)
-		val price = new NullableDoubleFieldValue(self, JpClassSignup.fields.price)
-		val closeId = new NullableIntFieldValue(self, JpClassSignup.fields.closeId)
-		val discountInstanceId = new NullableIntFieldValue(self, JpClassSignup.fields.discountInstanceId)
-		val paymentMedium = new NullableStringFieldValue(self, JpClassSignup.fields.paymentMedium)
-		val ccTransNum = new NullableStringFieldValue(self, JpClassSignup.fields.ccTransNum)
-		val voidCloseId = new NullableIntFieldValue(self, JpClassSignup.fields.voidCloseId)
-		val signupNote = new NullableStringFieldValue(self, JpClassSignup.fields.signupNote)
-		val ignoreIllegalSignup = new NullableBooleanFIeldValue(self, JpClassSignup.fields.ignoreIllegalSignup)
-		val staggerId = new NullableIntFieldValue(self, JpClassSignup.fields.staggerId)
-		val parentSignupNote = new NullableStringFieldValue(self, JpClassSignup.fields.parentSignupNote)
-		val sectionId = new NullableIntFieldValue(self, JpClassSignup.fields.sectionId)
-		val sectionLookupId = new NullableIntFieldValue(self, JpClassSignup.fields.sectionLookupId)
-	}
-}
-
-object JpClassSignup extends StorableObject[JpClassSignup] {
-	val entityName: String = "JP_CLASS_SIGNUPS"
-
-	object fields extends FieldsObject {
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val signupDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNUP_DATETIME")
-		val sequence = new NullableDoubleDatabaseField(self, "SEQUENCE")
-		val signupType = new NullableBooleanDatabaseField(self, "SIGNUP_TYPE")
-		val groupId = new NullableIntDatabaseField(self, "GROUP_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val isReserve = new NullableBooleanDatabaseField(self, "IS_RESERVE")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 50)
-		val ccTransNum = new NullableStringDatabaseField(self, "CC_TRANS_NUM", 10)
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val signupNote = new NullableStringDatabaseField(self, "SIGNUP_NOTE", 4000)
-		val ignoreIllegalSignup = new NullableBooleanDatabaseField(self, "IGNORE_ILLEGAL_SIGNUP")
-		val staggerId = new NullableIntDatabaseField(self, "STAGGER_ID")
-		val parentSignupNote = new NullableStringDatabaseField(self, "PARENT_SIGNUP_NOTE", 4000)
-		val sectionId = new NullableIntDatabaseField(self, "SECTION_ID")
-		val sectionLookupId = new NullableIntDatabaseField(self, "SECTION_LOOKUP_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.signupId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSignupsSkill.scala b/entity-templates/JpClassSignupsSkill.scala
deleted file mode 100644
index bb8abfd3..00000000
--- a/entity-templates/JpClassSignupsSkill.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSignupsSkill extends StorableClass(JpClassSignupsSkill) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, JpClassSignupsSkill.fields.assignId)
-		val signupId = new NullableIntFieldValue(self, JpClassSignupsSkill.fields.signupId)
-		val skillId = new NullableIntFieldValue(self, JpClassSignupsSkill.fields.skillId)
-		val ratingId = new NullableIntFieldValue(self, JpClassSignupsSkill.fields.ratingId)
-		val changedDatetime = new NullableLocalDateTimeFieldValue(self, JpClassSignupsSkill.fields.changedDatetime)
-		val instructor = new NullableStringFieldValue(self, JpClassSignupsSkill.fields.instructor)
-		val comments = new NullableUnknownFieldType(self, JpClassSignupsSkill.fields.comments)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSignupsSkill.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSignupsSkill.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSignupsSkill.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSignupsSkill.fields.updatedBy)
-	}
-}
-
-object JpClassSignupsSkill extends StorableObject[JpClassSignupsSkill] {
-	val entityName: String = "JP_CLASS_SIGNUPS_SKILLS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val signupId = new NullableIntDatabaseField(self, "SIGNUP_ID")
-		val skillId = new NullableIntDatabaseField(self, "SKILL_ID")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-		val changedDatetime = new NullableLocalDateTimeDatabaseField(self, "CHANGED_DATETIME")
-		val instructor = new NullableStringDatabaseField(self, "INSTRUCTOR", 500)
-		val comments = new NullableUnknownFieldType(self, "COMMENTS")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSkill.scala b/entity-templates/JpClassSkill.scala
deleted file mode 100644
index 6e02e212..00000000
--- a/entity-templates/JpClassSkill.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSkill extends StorableClass(JpClassSkill) {
-	object values extends ValuesObject {
-		val skillId = new IntFieldValue(self, JpClassSkill.fields.skillId)
-		val typeId = new NullableIntFieldValue(self, JpClassSkill.fields.typeId)
-		val skillName = new StringFieldValue(self, JpClassSkill.fields.skillName)
-		val assessment = new NullableStringFieldValue(self, JpClassSkill.fields.assessment)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSkill.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSkill.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSkill.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSkill.fields.updatedBy)
-		val displayOrder = new NullableDoubleFieldValue(self, JpClassSkill.fields.displayOrder)
-		val active = new NullableBooleanFIeldValue(self, JpClassSkill.fields.active)
-	}
-}
-
-object JpClassSkill extends StorableObject[JpClassSkill] {
-	val entityName: String = "JP_CLASS_SKILLS"
-
-	object fields extends FieldsObject {
-		val skillId = new IntDatabaseField(self, "SKILL_ID")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val skillName = new StringDatabaseField(self, "SKILL_NAME", 200)
-		val assessment = new NullableStringDatabaseField(self, "ASSESSMENT", 1000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.skillId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassSkillsRating.scala b/entity-templates/JpClassSkillsRating.scala
deleted file mode 100644
index 743bb462..00000000
--- a/entity-templates/JpClassSkillsRating.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassSkillsRating extends StorableClass(JpClassSkillsRating) {
-	object values extends ValuesObject {
-		val ratingId = new IntFieldValue(self, JpClassSkillsRating.fields.ratingId)
-		val skillId = new IntFieldValue(self, JpClassSkillsRating.fields.skillId)
-		val ratingName = new StringFieldValue(self, JpClassSkillsRating.fields.ratingName)
-		val ratingSeq = new DoubleFieldValue(self, JpClassSkillsRating.fields.ratingSeq)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassSkillsRating.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassSkillsRating.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassSkillsRating.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassSkillsRating.fields.updatedBy)
-	}
-}
-
-object JpClassSkillsRating extends StorableObject[JpClassSkillsRating] {
-	val entityName: String = "JP_CLASS_SKILLS_RATINGS"
-
-	object fields extends FieldsObject {
-		val ratingId = new IntDatabaseField(self, "RATING_ID")
-		val skillId = new IntDatabaseField(self, "SKILL_ID")
-		val ratingName = new StringDatabaseField(self, "RATING_NAME", 50)
-		val ratingSeq = new DoubleDatabaseField(self, "RATING_SEQ")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.ratingId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassStagger.scala b/entity-templates/JpClassStagger.scala
deleted file mode 100644
index 480d2e73..00000000
--- a/entity-templates/JpClassStagger.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassStagger extends StorableClass(JpClassStagger) {
-	object values extends ValuesObject {
-		val staggerId = new IntFieldValue(self, JpClassStagger.fields.staggerId)
-		val instanceId = new IntFieldValue(self, JpClassStagger.fields.instanceId)
-		val staggerDate = new LocalDateTimeFieldValue(self, JpClassStagger.fields.staggerDate)
-		val occupancy = new DoubleFieldValue(self, JpClassStagger.fields.occupancy)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassStagger.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassStagger.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassStagger.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassStagger.fields.updatedBy)
-		val reserveOnly = new NullableBooleanFIeldValue(self, JpClassStagger.fields.reserveOnly)
-		val reserveRelease = new NullableLocalDateTimeFieldValue(self, JpClassStagger.fields.reserveRelease)
-	}
-}
-
-object JpClassStagger extends StorableObject[JpClassStagger] {
-	val entityName: String = "JP_CLASS_STAGGERS"
-
-	object fields extends FieldsObject {
-		val staggerId = new IntDatabaseField(self, "STAGGER_ID")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val staggerDate = new LocalDateTimeDatabaseField(self, "STAGGER_DATE")
-		val occupancy = new DoubleDatabaseField(self, "OCCUPANCY")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val reserveOnly = new NullableBooleanDatabaseField(self, "RESERVE_ONLY")
-		val reserveRelease = new NullableLocalDateTimeDatabaseField(self, "RESERVE_RELEASE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.staggerId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassType.scala b/entity-templates/JpClassType.scala
deleted file mode 100644
index 6f5b004e..00000000
--- a/entity-templates/JpClassType.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassType extends StorableClass(JpClassType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, JpClassType.fields.typeId)
-		val typeName = new NullableStringFieldValue(self, JpClassType.fields.typeName)
-		val signupMax = new NullableDoubleFieldValue(self, JpClassType.fields.signupMax)
-		val allowMultiple = new NullableBooleanFIeldValue(self, JpClassType.fields.allowMultiple)
-		val ratingPrereq = new NullableDoubleFieldValue(self, JpClassType.fields.ratingPrereq)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassType.fields.updatedBy)
-		val sessionLength = new NullableDoubleFieldValue(self, JpClassType.fields.sessionLength)
-		val sessionCt = new NullableDoubleFieldValue(self, JpClassType.fields.sessionCt)
-		val ratingOverkill = new NullableDoubleFieldValue(self, JpClassType.fields.ratingOverkill)
-		val minAge = new NullableDoubleFieldValue(self, JpClassType.fields.minAge)
-		val maxAge = new NullableDoubleFieldValue(self, JpClassType.fields.maxAge)
-		val minSessionsForAttended = new NullableDoubleFieldValue(self, JpClassType.fields.minSessionsForAttended)
-		val active = new NullableBooleanFIeldValue(self, JpClassType.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, JpClassType.fields.displayOrder)
-		val noLimit = new NullableBooleanFIeldValue(self, JpClassType.fields.noLimit)
-	}
-}
-
-object JpClassType extends StorableObject[JpClassType] {
-	val entityName: String = "JP_CLASS_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new NullableStringDatabaseField(self, "TYPE_NAME", 100)
-		val signupMax = new NullableDoubleDatabaseField(self, "SIGNUP_MAX")
-		val allowMultiple = new NullableBooleanDatabaseField(self, "ALLOW_MULTIPLE")
-		val ratingPrereq = new NullableDoubleDatabaseField(self, "RATING_PREREQ")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val sessionLength = new NullableDoubleDatabaseField(self, "SESSION_LENGTH")
-		val sessionCt = new NullableDoubleDatabaseField(self, "SESSION_CT")
-		val ratingOverkill = new NullableDoubleDatabaseField(self, "RATING_OVERKILL")
-		val minAge = new NullableDoubleDatabaseField(self, "MIN_AGE")
-		val maxAge = new NullableDoubleDatabaseField(self, "MAX_AGE")
-		val minSessionsForAttended = new NullableDoubleDatabaseField(self, "MIN_SESSIONS_FOR_ATTENDED")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val noLimit = new NullableBooleanDatabaseField(self, "NO_LIMIT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassTypeOverride.scala b/entity-templates/JpClassTypeOverride.scala
deleted file mode 100644
index fcf24573..00000000
--- a/entity-templates/JpClassTypeOverride.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassTypeOverride extends StorableClass(JpClassTypeOverride) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, JpClassTypeOverride.fields.rowId)
-		val personId = new IntFieldValue(self, JpClassTypeOverride.fields.personId)
-		val typeId = new IntFieldValue(self, JpClassTypeOverride.fields.typeId)
-		val season = new NullableDoubleFieldValue(self, JpClassTypeOverride.fields.season)
-		val isForOverkill = new BooleanFIeldValue(self, JpClassTypeOverride.fields.isForOverkill)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassTypeOverride.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassTypeOverride.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassTypeOverride.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassTypeOverride.fields.updatedBy)
-	}
-}
-
-object JpClassTypeOverride extends StorableObject[JpClassTypeOverride] {
-	val entityName: String = "JP_CLASS_TYPE_OVERRIDES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val isForOverkill = new BooleanDatabaseField(self, "IS_FOR_OVERKILL")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClassWlResult.scala b/entity-templates/JpClassWlResult.scala
deleted file mode 100644
index af931567..00000000
--- a/entity-templates/JpClassWlResult.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClassWlResult extends StorableClass(JpClassWlResult) {
-	object values extends ValuesObject {
-		val signupId = new IntFieldValue(self, JpClassWlResult.fields.signupId)
-		val foVmDatetime = new NullableLocalDateTimeFieldValue(self, JpClassWlResult.fields.foVmDatetime)
-		val wlResult = new BooleanFIeldValue(self, JpClassWlResult.fields.wlResult)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClassWlResult.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClassWlResult.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClassWlResult.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClassWlResult.fields.updatedBy)
-		val offerExpDatetime = new LocalDateTimeFieldValue(self, JpClassWlResult.fields.offerExpDatetime)
-		val foAlertDatetime = new LocalDateTimeFieldValue(self, JpClassWlResult.fields.foAlertDatetime)
-		val permitOvercrowd = new NullableBooleanFIeldValue(self, JpClassWlResult.fields.permitOvercrowd)
-		val preapprovedExp = new NullableLocalDateTimeFieldValue(self, JpClassWlResult.fields.preapprovedExp)
-	}
-}
-
-object JpClassWlResult extends StorableObject[JpClassWlResult] {
-	val entityName: String = "JP_CLASS_WL_RESULTS"
-
-	object fields extends FieldsObject {
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val foVmDatetime = new NullableLocalDateTimeDatabaseField(self, "FO_VM_DATETIME")
-		val wlResult = new BooleanDatabaseField(self, "WL_RESULT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val offerExpDatetime = new LocalDateTimeDatabaseField(self, "OFFER_EXP_DATETIME")
-		val foAlertDatetime = new LocalDateTimeDatabaseField(self, "FO_ALERT_DATETIME")
-		val permitOvercrowd = new NullableBooleanDatabaseField(self, "PERMIT_OVERCROWD")
-		val preapprovedExp = new NullableLocalDateTimeDatabaseField(self, "PREAPPROVED_EXP")
-	}
-
-	def primaryKey: IntDatabaseField = fields.signupId
-}
\ No newline at end of file
diff --git a/entity-templates/JpClosure.scala b/entity-templates/JpClosure.scala
deleted file mode 100644
index 16ab4808..00000000
--- a/entity-templates/JpClosure.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpClosure extends StorableClass(JpClosure) {
-	object values extends ValuesObject {
-		val closureId = new IntFieldValue(self, JpClosure.fields.closureId)
-		val drDate = new NullableLocalDateTimeFieldValue(self, JpClosure.fields.drDate)
-		val closeTime = new NullableLocalDateTimeFieldValue(self, JpClosure.fields.closeTime)
-		val reopenTime = new NullableLocalDateTimeFieldValue(self, JpClosure.fields.reopenTime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpClosure.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpClosure.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpClosure.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpClosure.fields.updatedBy)
-	}
-}
-
-object JpClosure extends StorableObject[JpClosure] {
-	val entityName: String = "JP_CLOSURES"
-
-	object fields extends FieldsObject {
-		val closureId = new IntDatabaseField(self, "CLOSURE_ID")
-		val drDate = new NullableLocalDateTimeDatabaseField(self, "DR_DATE")
-		val closeTime = new NullableLocalDateTimeDatabaseField(self, "CLOSE_TIME")
-		val reopenTime = new NullableLocalDateTimeDatabaseField(self, "REOPEN_TIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.closureId
-}
\ No newline at end of file
diff --git a/entity-templates/JpDockRpt.scala b/entity-templates/JpDockRpt.scala
deleted file mode 100644
index f99d0156..00000000
--- a/entity-templates/JpDockRpt.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpDockRpt extends StorableClass(JpDockRpt) {
-	object values extends ValuesObject {
-		val drId = new IntFieldValue(self, JpDockRpt.fields.drId)
-		val drDate = new NullableLocalDateTimeFieldValue(self, JpDockRpt.fields.drDate)
-		val mercSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.mercSo)
-		val kmSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.kmSo)
-		val laserSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.laserSo)
-		val 420So = new NullableDoubleFieldValue(self, JpDockRpt.fields.420So)
-		val r19So = new NullableDoubleFieldValue(self, JpDockRpt.fields.r19So)
-		val sonarSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.sonarSo)
-		val wsSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.wsSo)
-		val kayakSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.kayakSo)
-		val launchesAvail = new NullableStringFieldValue(self, JpDockRpt.fields.launchesAvail)
-		val capsizes = new NullableDoubleFieldValue(self, JpDockRpt.fields.capsizes)
-		val maxWait = new NullableDoubleFieldValue(self, JpDockRpt.fields.maxWait)
-		val ra = new NullableDoubleFieldValue(self, JpDockRpt.fields.ra)
-		val totalCrew = new NullableDoubleFieldValue(self, JpDockRpt.fields.totalCrew)
-		val damage = new NullableStringFieldValue(self, JpDockRpt.fields.damage)
-		val injuries = new NullableStringFieldValue(self, JpDockRpt.fields.injuries)
-		val excursions = new NullableStringFieldValue(self, JpDockRpt.fields.excursions)
-		val activities = new NullableStringFieldValue(self, JpDockRpt.fields.activities)
-		val notes = new NullableStringFieldValue(self, JpDockRpt.fields.notes)
-		val supSo = new NullableDoubleFieldValue(self, JpDockRpt.fields.supSo)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpDockRpt.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpDockRpt.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpDockRpt.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpDockRpt.fields.updatedBy)
-	}
-}
-
-object JpDockRpt extends StorableObject[JpDockRpt] {
-	val entityName: String = "JP_DOCK_RPT"
-
-	object fields extends FieldsObject {
-		val drId = new IntDatabaseField(self, "DR_ID")
-		val drDate = new NullableLocalDateTimeDatabaseField(self, "DR_DATE")
-		val mercSo = new NullableDoubleDatabaseField(self, "MERC_SO")
-		val kmSo = new NullableDoubleDatabaseField(self, "KM_SO")
-		val laserSo = new NullableDoubleDatabaseField(self, "LASER_SO")
-		val 420So = new NullableDoubleDatabaseField(self, "420_SO")
-		val r19So = new NullableDoubleDatabaseField(self, "R19_SO")
-		val sonarSo = new NullableDoubleDatabaseField(self, "SONAR_SO")
-		val wsSo = new NullableDoubleDatabaseField(self, "WS_SO")
-		val kayakSo = new NullableDoubleDatabaseField(self, "KAYAK_SO")
-		val launchesAvail = new NullableStringDatabaseField(self, "LAUNCHES_AVAIL", 100)
-		val capsizes = new NullableDoubleDatabaseField(self, "CAPSIZES")
-		val maxWait = new NullableDoubleDatabaseField(self, "MAX_WAIT")
-		val ra = new NullableDoubleDatabaseField(self, "RA")
-		val totalCrew = new NullableDoubleDatabaseField(self, "TOTAL_CREW")
-		val damage = new NullableStringDatabaseField(self, "DAMAGE", 4000)
-		val injuries = new NullableStringDatabaseField(self, "INJURIES", 4000)
-		val excursions = new NullableStringDatabaseField(self, "EXCURSIONS", 4000)
-		val activities = new NullableStringDatabaseField(self, "ACTIVITIES", 4000)
-		val notes = new NullableStringDatabaseField(self, "NOTES", 4000)
-		val supSo = new NullableDoubleDatabaseField(self, "SUP_SO")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.drId
-}
\ No newline at end of file
diff --git a/entity-templates/JpEmailTracking.scala b/entity-templates/JpEmailTracking.scala
deleted file mode 100644
index 276cb30f..00000000
--- a/entity-templates/JpEmailTracking.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpEmailTracking extends StorableClass(JpEmailTracking) {
-	object values extends ValuesObject {
-		val emailId = new IntFieldValue(self, JpEmailTracking.fields.emailId)
-		val signupId = new NullableIntFieldValue(self, JpEmailTracking.fields.signupId)
-		val emailFrom = new NullableStringFieldValue(self, JpEmailTracking.fields.emailFrom)
-		val emailTo = new NullableStringFieldValue(self, JpEmailTracking.fields.emailTo)
-		val emailSubj = new NullableStringFieldValue(self, JpEmailTracking.fields.emailSubj)
-		val emailPlainBody = new NullableStringFieldValue(self, JpEmailTracking.fields.emailPlainBody)
-		val emailHtmlBody = new NullableStringFieldValue(self, JpEmailTracking.fields.emailHtmlBody)
-		val sendDatetime = new NullableLocalDateTimeFieldValue(self, JpEmailTracking.fields.sendDatetime)
-		val emailCc = new NullableStringFieldValue(self, JpEmailTracking.fields.emailCc)
-		val emailBcc = new NullableStringFieldValue(self, JpEmailTracking.fields.emailBcc)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpEmailTracking.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpEmailTracking.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpEmailTracking.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpEmailTracking.fields.updatedBy)
-	}
-}
-
-object JpEmailTracking extends StorableObject[JpEmailTracking] {
-	val entityName: String = "JP_EMAIL_TRACKING"
-
-	object fields extends FieldsObject {
-		val emailId = new IntDatabaseField(self, "EMAIL_ID")
-		val signupId = new NullableIntDatabaseField(self, "SIGNUP_ID")
-		val emailFrom = new NullableStringDatabaseField(self, "EMAIL_FROM", 200)
-		val emailTo = new NullableStringDatabaseField(self, "EMAIL_TO", 200)
-		val emailSubj = new NullableStringDatabaseField(self, "EMAIL_SUBJ", 500)
-		val emailPlainBody = new NullableStringDatabaseField(self, "EMAIL_PLAIN_BODY", 4000)
-		val emailHtmlBody = new NullableStringDatabaseField(self, "EMAIL_HTML_BODY", 4000)
-		val sendDatetime = new NullableLocalDateTimeDatabaseField(self, "SEND_DATETIME")
-		val emailCc = new NullableStringDatabaseField(self, "EMAIL_CC", 200)
-		val emailBcc = new NullableStringDatabaseField(self, "EMAIL_BCC", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.emailId
-}
\ No newline at end of file
diff --git a/entity-templates/JpGroup.scala b/entity-templates/JpGroup.scala
deleted file mode 100644
index cf308cca..00000000
--- a/entity-templates/JpGroup.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpGroup extends StorableClass(JpGroup) {
-	object values extends ValuesObject {
-		val groupId = new IntFieldValue(self, JpGroup.fields.groupId)
-		val groupName = new StringFieldValue(self, JpGroup.fields.groupName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpGroup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpGroup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpGroup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpGroup.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, JpGroup.fields.active)
-	}
-}
-
-object JpGroup extends StorableObject[JpGroup] {
-	val entityName: String = "JP_GROUPS"
-
-	object fields extends FieldsObject {
-		val groupId = new IntDatabaseField(self, "GROUP_ID")
-		@NullableInDatabase
-		val groupName = new StringDatabaseField(self, "GROUP_NAME", 200)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.groupId
-}
\ No newline at end of file
diff --git a/entity-templates/JpNoSwim.scala b/entity-templates/JpNoSwim.scala
deleted file mode 100644
index d5e66853..00000000
--- a/entity-templates/JpNoSwim.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpNoSwim extends StorableClass(JpNoSwim) {
-	object values extends ValuesObject {
-		val swimId = new IntFieldValue(self, JpNoSwim.fields.swimId)
-		val cardNum = new NullableStringFieldValue(self, JpNoSwim.fields.cardNum)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpNoSwim.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpNoSwim.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpNoSwim.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpNoSwim.fields.updatedBy)
-	}
-}
-
-object JpNoSwim extends StorableObject[JpNoSwim] {
-	val entityName: String = "JP_NO_SWIM"
-
-	object fields extends FieldsObject {
-		val swimId = new IntDatabaseField(self, "SWIM_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 20)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.swimId
-}
\ No newline at end of file
diff --git a/entity-templates/JpRatingsGranted.scala b/entity-templates/JpRatingsGranted.scala
deleted file mode 100644
index 7a51ef2e..00000000
--- a/entity-templates/JpRatingsGranted.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpRatingsGranted extends StorableClass(JpRatingsGranted) {
-	object values extends ValuesObject {
-		val grantId = new IntFieldValue(self, JpRatingsGranted.fields.grantId)
-		val ratingId = new NullableIntFieldValue(self, JpRatingsGranted.fields.ratingId)
-		val quantity = new NullableDoubleFieldValue(self, JpRatingsGranted.fields.quantity)
-		val drDate = new NullableLocalDateTimeFieldValue(self, JpRatingsGranted.fields.drDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpRatingsGranted.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpRatingsGranted.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpRatingsGranted.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpRatingsGranted.fields.updatedBy)
-	}
-}
-
-object JpRatingsGranted extends StorableObject[JpRatingsGranted] {
-	val entityName: String = "JP_RATINGS_GRANTED"
-
-	object fields extends FieldsObject {
-		val grantId = new IntDatabaseField(self, "GRANT_ID")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-		val quantity = new NullableDoubleDatabaseField(self, "QUANTITY")
-		val drDate = new NullableLocalDateTimeDatabaseField(self, "DR_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.grantId
-}
\ No newline at end of file
diff --git a/entity-templates/JpReplMapping.scala b/entity-templates/JpReplMapping.scala
deleted file mode 100644
index 35e1b728..00000000
--- a/entity-templates/JpReplMapping.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpReplMapping extends StorableClass(JpReplMapping) {
-	object values extends ValuesObject {
-		val mapId = new IntFieldValue(self, JpReplMapping.fields.mapId)
-		val originalNum = new NullableStringFieldValue(self, JpReplMapping.fields.originalNum)
-		val replNum = new NullableStringFieldValue(self, JpReplMapping.fields.replNum)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpReplMapping.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpReplMapping.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpReplMapping.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpReplMapping.fields.updatedBy)
-	}
-}
-
-object JpReplMapping extends StorableObject[JpReplMapping] {
-	val entityName: String = "JP_REPL_MAPPING"
-
-	object fields extends FieldsObject {
-		val mapId = new IntDatabaseField(self, "MAP_ID")
-		val originalNum = new NullableStringDatabaseField(self, "ORIGINAL_NUM", 15)
-		val replNum = new NullableStringDatabaseField(self, "REPL_NUM", 15)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.mapId
-}
\ No newline at end of file
diff --git a/entity-templates/JpReserve.scala b/entity-templates/JpReserve.scala
deleted file mode 100644
index 655fd17c..00000000
--- a/entity-templates/JpReserve.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpReserve extends StorableClass(JpReserve) {
-	object values extends ValuesObject {
-		val failure = new DoubleFieldValue(self, JpReserve.fields.failure)
-		val reserve = new DoubleFieldValue(self, JpReserve.fields.reserve)
-	}
-}
-
-object JpReserve extends StorableObject[JpReserve] {
-	val entityName: String = "JP_RESERVES"
-
-	object fields extends FieldsObject {
-		val failure = new DoubleDatabaseField(self, "FAILURE")
-		val reserve = new DoubleDatabaseField(self, "RESERVE")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpSpecialNeed.scala b/entity-templates/JpSpecialNeed.scala
deleted file mode 100644
index ed8b4e51..00000000
--- a/entity-templates/JpSpecialNeed.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpSpecialNeed extends StorableClass(JpSpecialNeed) {
-	object values extends ValuesObject {
-		val cardId = new IntFieldValue(self, JpSpecialNeed.fields.cardId)
-		val cardNum = new NullableStringFieldValue(self, JpSpecialNeed.fields.cardNum)
-		val personId = new NullableIntFieldValue(self, JpSpecialNeed.fields.personId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpSpecialNeed.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpSpecialNeed.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpSpecialNeed.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpSpecialNeed.fields.updatedBy)
-	}
-}
-
-object JpSpecialNeed extends StorableObject[JpSpecialNeed] {
-	val entityName: String = "JP_SPECIAL_NEEDS"
-
-	object fields extends FieldsObject {
-		val cardId = new IntDatabaseField(self, "CARD_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.cardId
-}
\ No newline at end of file
diff --git a/entity-templates/JpSpecialNeedsByWeek.scala b/entity-templates/JpSpecialNeedsByWeek.scala
deleted file mode 100644
index 46790bb0..00000000
--- a/entity-templates/JpSpecialNeedsByWeek.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpSpecialNeedsByWeek extends StorableClass(JpSpecialNeedsByWeek) {
-	object values extends ValuesObject {
-		val nameFirst = new NullableStringFieldValue(self, JpSpecialNeedsByWeek.fields.nameFirst)
-		val nameLast = new NullableStringFieldValue(self, JpSpecialNeedsByWeek.fields.nameLast)
-		val allergies = new NullableStringFieldValue(self, JpSpecialNeedsByWeek.fields.allergies)
-		val medications = new NullableStringFieldValue(self, JpSpecialNeedsByWeek.fields.medications)
-		val specialNeeds = new NullableStringFieldValue(self, JpSpecialNeedsByWeek.fields.specialNeeds)
-		val season = new NullableDoubleFieldValue(self, JpSpecialNeedsByWeek.fields.season)
-		val week = new NullableDoubleFieldValue(self, JpSpecialNeedsByWeek.fields.week)
-	}
-}
-
-object JpSpecialNeedsByWeek extends StorableObject[JpSpecialNeedsByWeek] {
-	val entityName: String = "JP_SPECIAL_NEEDS_BY_WEEK"
-
-	object fields extends FieldsObject {
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val allergies = new NullableStringDatabaseField(self, "ALLERGIES", 4000)
-		val medications = new NullableStringDatabaseField(self, "MEDICATIONS", 4000)
-		val specialNeeds = new NullableStringDatabaseField(self, "SPECIAL_NEEDS", 4000)
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val week = new NullableDoubleDatabaseField(self, "WEEK")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpSpecialNeedsCopy.scala b/entity-templates/JpSpecialNeedsCopy.scala
deleted file mode 100644
index fecd50a5..00000000
--- a/entity-templates/JpSpecialNeedsCopy.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpSpecialNeedsCopy extends StorableClass(JpSpecialNeedsCopy) {
-	object values extends ValuesObject {
-		val cardId = new NullableIntFieldValue(self, JpSpecialNeedsCopy.fields.cardId)
-		val cardNum = new NullableStringFieldValue(self, JpSpecialNeedsCopy.fields.cardNum)
-		val personId = new NullableIntFieldValue(self, JpSpecialNeedsCopy.fields.personId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpSpecialNeedsCopy.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpSpecialNeedsCopy.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpSpecialNeedsCopy.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpSpecialNeedsCopy.fields.updatedBy)
-	}
-}
-
-object JpSpecialNeedsCopy extends StorableObject[JpSpecialNeedsCopy] {
-	val entityName: String = "JP_SPECIAL_NEEDS_COPY"
-
-	object fields extends FieldsObject {
-		val cardId = new NullableIntDatabaseField(self, "CARD_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpSpringWaitlist.scala b/entity-templates/JpSpringWaitlist.scala
deleted file mode 100644
index 7e15b43c..00000000
--- a/entity-templates/JpSpringWaitlist.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpSpringWaitlist extends StorableClass(JpSpringWaitlist) {
-	object values extends ValuesObject {
-		val regId = new IntFieldValue(self, JpSpringWaitlist.fields.regId)
-		val membershipTypeId = new NullableIntFieldValue(self, JpSpringWaitlist.fields.membershipTypeId)
-		val personId = new NullableIntFieldValue(self, JpSpringWaitlist.fields.personId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpSpringWaitlist.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpSpringWaitlist.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpSpringWaitlist.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpSpringWaitlist.fields.updatedBy)
-		val waitBegin = new NullableLocalDateTimeFieldValue(self, JpSpringWaitlist.fields.waitBegin)
-	}
-}
-
-object JpSpringWaitlist extends StorableObject[JpSpringWaitlist] {
-	val entityName: String = "JP_SPRING_WAITLIST"
-
-	object fields extends FieldsObject {
-		val regId = new IntDatabaseField(self, "REG_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val waitBegin = new NullableLocalDateTimeDatabaseField(self, "WAIT_BEGIN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.regId
-}
\ No newline at end of file
diff --git a/entity-templates/JpTeam.scala b/entity-templates/JpTeam.scala
deleted file mode 100644
index e01001a3..00000000
--- a/entity-templates/JpTeam.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpTeam extends StorableClass(JpTeam) {
-	object values extends ValuesObject {
-		val teamId = new IntFieldValue(self, JpTeam.fields.teamId)
-		val teamName = new NullableStringFieldValue(self, JpTeam.fields.teamName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpTeam.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpTeam.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpTeam.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpTeam.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, JpTeam.fields.active)
-		val imageFilename = new NullableStringFieldValue(self, JpTeam.fields.imageFilename)
-	}
-}
-
-object JpTeam extends StorableObject[JpTeam] {
-	val entityName: String = "JP_TEAMS"
-
-	object fields extends FieldsObject {
-		val teamId = new IntDatabaseField(self, "TEAM_ID")
-		val teamName = new NullableStringDatabaseField(self, "TEAM_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val imageFilename = new NullableStringDatabaseField(self, "IMAGE_FILENAME", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.teamId
-}
\ No newline at end of file
diff --git a/entity-templates/JpTeamEvent.scala b/entity-templates/JpTeamEvent.scala
deleted file mode 100644
index b05ef46e..00000000
--- a/entity-templates/JpTeamEvent.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpTeamEvent extends StorableClass(JpTeamEvent) {
-	object values extends ValuesObject {
-		val eventId = new IntFieldValue(self, JpTeamEvent.fields.eventId)
-		val memo = new NullableStringFieldValue(self, JpTeamEvent.fields.memo)
-		val awardedBy = new NullableStringFieldValue(self, JpTeamEvent.fields.awardedBy)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpTeamEvent.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpTeamEvent.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpTeamEvent.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpTeamEvent.fields.updatedBy)
-		val awardedDate = new NullableLocalDateTimeFieldValue(self, JpTeamEvent.fields.awardedDate)
-	}
-}
-
-object JpTeamEvent extends StorableObject[JpTeamEvent] {
-	val entityName: String = "JP_TEAM_EVENTS"
-
-	object fields extends FieldsObject {
-		val eventId = new IntDatabaseField(self, "EVENT_ID")
-		val memo = new NullableStringDatabaseField(self, "MEMO", 4000)
-		val awardedBy = new NullableStringDatabaseField(self, "AWARDED_BY", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val awardedDate = new NullableLocalDateTimeDatabaseField(self, "AWARDED_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.eventId
-}
\ No newline at end of file
diff --git a/entity-templates/JpTeamEventPoint.scala b/entity-templates/JpTeamEventPoint.scala
deleted file mode 100644
index ad098a0a..00000000
--- a/entity-templates/JpTeamEventPoint.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpTeamEventPoint extends StorableClass(JpTeamEventPoint) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, JpTeamEventPoint.fields.rowId)
-		val eventId = new NullableIntFieldValue(self, JpTeamEventPoint.fields.eventId)
-		val teamId = new NullableIntFieldValue(self, JpTeamEventPoint.fields.teamId)
-		val points = new NullableDoubleFieldValue(self, JpTeamEventPoint.fields.points)
-	}
-}
-
-object JpTeamEventPoint extends StorableObject[JpTeamEventPoint] {
-	val entityName: String = "JP_TEAM_EVENT_POINTS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val eventId = new NullableIntDatabaseField(self, "EVENT_ID")
-		val teamId = new NullableIntDatabaseField(self, "TEAM_ID")
-		val points = new NullableDoubleDatabaseField(self, "POINTS")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/JpWeather.scala b/entity-templates/JpWeather.scala
deleted file mode 100644
index 39c71acd..00000000
--- a/entity-templates/JpWeather.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpWeather extends StorableClass(JpWeather) {
-	object values extends ValuesObject {
-		val weatherId = new IntFieldValue(self, JpWeather.fields.weatherId)
-		val drDate = new NullableLocalDateTimeFieldValue(self, JpWeather.fields.drDate)
-		val weatherTime = new NullableStringFieldValue(self, JpWeather.fields.weatherTime)
-		val conditions = new NullableStringFieldValue(self, JpWeather.fields.conditions)
-		val temp = new NullableDoubleFieldValue(self, JpWeather.fields.temp)
-		val windDir = new NullableStringFieldValue(self, JpWeather.fields.windDir)
-		val windSteady = new NullableDoubleFieldValue(self, JpWeather.fields.windSteady)
-		val windGust = new NullableDoubleFieldValue(self, JpWeather.fields.windGust)
-		val flag = new NullableStringFieldValue(self, JpWeather.fields.flag)
-		val restrictions = new NullableStringFieldValue(self, JpWeather.fields.restrictions)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpWeather.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpWeather.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpWeather.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpWeather.fields.updatedBy)
-	}
-}
-
-object JpWeather extends StorableObject[JpWeather] {
-	val entityName: String = "JP_WEATHER"
-
-	object fields extends FieldsObject {
-		val weatherId = new IntDatabaseField(self, "WEATHER_ID")
-		val drDate = new NullableLocalDateTimeDatabaseField(self, "DR_DATE")
-		val weatherTime = new NullableStringDatabaseField(self, "WEATHER_TIME", 20)
-		val conditions = new NullableStringDatabaseField(self, "CONDITIONS", 100)
-		val temp = new NullableDoubleDatabaseField(self, "TEMP")
-		val windDir = new NullableStringDatabaseField(self, "WIND_DIR", 5)
-		val windSteady = new NullableDoubleDatabaseField(self, "WIND_STEADY")
-		val windGust = new NullableDoubleDatabaseField(self, "WIND_GUST")
-		val flag = new NullableStringDatabaseField(self, "FLAG", 20)
-		val restrictions = new NullableStringDatabaseField(self, "RESTRICTIONS", 4000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.weatherId
-}
\ No newline at end of file
diff --git a/entity-templates/JpWeek.scala b/entity-templates/JpWeek.scala
deleted file mode 100644
index 7d693783..00000000
--- a/entity-templates/JpWeek.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpWeek extends StorableClass(JpWeek) {
-	object values extends ValuesObject {
-		val season = new NullableDoubleFieldValue(self, JpWeek.fields.season)
-		val monday = new NullableLocalDateTimeFieldValue(self, JpWeek.fields.monday)
-		val sunday = new NullableLocalDateTimeFieldValue(self, JpWeek.fields.sunday)
-		val week = new NullableDoubleFieldValue(self, JpWeek.fields.week)
-		val weekAlias = new NullableStringFieldValue(self, JpWeek.fields.weekAlias)
-	}
-}
-
-object JpWeek extends StorableObject[JpWeek] {
-	val entityName: String = "JP_WEEKS"
-
-	object fields extends FieldsObject {
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val monday = new NullableLocalDateTimeDatabaseField(self, "MONDAY")
-		val sunday = new NullableLocalDateTimeDatabaseField(self, "SUNDAY")
-		val week = new NullableDoubleDatabaseField(self, "WEEK")
-		val weekAlias = new NullableStringDatabaseField(self, "WEEK_ALIAS", 11)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/JpcInstancesDiscount.scala b/entity-templates/JpcInstancesDiscount.scala
deleted file mode 100644
index afa02371..00000000
--- a/entity-templates/JpcInstancesDiscount.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class JpcInstancesDiscount extends StorableClass(JpcInstancesDiscount) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, JpcInstancesDiscount.fields.assignId)
-		val classInstanceId = new NullableIntFieldValue(self, JpcInstancesDiscount.fields.classInstanceId)
-		val discountInstanceId = new NullableIntFieldValue(self, JpcInstancesDiscount.fields.discountInstanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, JpcInstancesDiscount.fields.discountAmt)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, JpcInstancesDiscount.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, JpcInstancesDiscount.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, JpcInstancesDiscount.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, JpcInstancesDiscount.fields.updatedBy)
-		val regCodeRowId = new NullableIntFieldValue(self, JpcInstancesDiscount.fields.regCodeRowId)
-	}
-}
-
-object JpcInstancesDiscount extends StorableObject[JpcInstancesDiscount] {
-	val entityName: String = "JPC_INSTANCES_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val classInstanceId = new NullableIntDatabaseField(self, "CLASS_INSTANCE_ID")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/Language.scala b/entity-templates/Language.scala
deleted file mode 100644
index d61097f7..00000000
--- a/entity-templates/Language.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Language extends StorableClass(Language) {
-	object values extends ValuesObject {
-		val languageId = new IntFieldValue(self, Language.fields.languageId)
-		val languageName = new NullableStringFieldValue(self, Language.fields.languageName)
-	}
-}
-
-object Language extends StorableObject[Language] {
-	val entityName: String = "LANGUAGES"
-
-	object fields extends FieldsObject {
-		val languageId = new IntDatabaseField(self, "LANGUAGE_ID")
-		val languageName = new NullableStringDatabaseField(self, "LANGUAGE_NAME", 100)
-	}
-
-	def primaryKey: IntDatabaseField = fields.languageId
-}
\ No newline at end of file
diff --git a/entity-templates/M2ToHelm.scala b/entity-templates/M2ToHelm.scala
deleted file mode 100644
index e807bfad..00000000
--- a/entity-templates/M2ToHelm.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class M2ToHelm extends StorableClass(M2ToHelm) {
-	object values extends ValuesObject {
-		val week = new NullableDoubleFieldValue(self, M2ToHelm.fields.week)
-		val m2 = new DoubleFieldValue(self, M2ToHelm.fields.m2)
-		val helms = new NullableDoubleFieldValue(self, M2ToHelm.fields.helms)
-	}
-}
-
-object M2ToHelm extends StorableObject[M2ToHelm] {
-	val entityName: String = "M2_TO_HELMS"
-
-	object fields extends FieldsObject {
-		val week = new NullableDoubleDatabaseField(self, "WEEK")
-		val m2 = new DoubleDatabaseField(self, "M2")
-		val helms = new NullableDoubleDatabaseField(self, "HELMS")
-	}
-
-	def primaryKey: IntDatabaseField = fields.m2
-}
\ No newline at end of file
diff --git a/entity-templates/MemTypesAllowedRating.scala b/entity-templates/MemTypesAllowedRating.scala
deleted file mode 100644
index aae7be9b..00000000
--- a/entity-templates/MemTypesAllowedRating.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MemTypesAllowedRating extends StorableClass(MemTypesAllowedRating) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, MemTypesAllowedRating.fields.assignId)
-		val membershipTypeId = new NullableIntFieldValue(self, MemTypesAllowedRating.fields.membershipTypeId)
-		val ratingId = new NullableIntFieldValue(self, MemTypesAllowedRating.fields.ratingId)
-	}
-}
-
-object MemTypesAllowedRating extends StorableObject[MemTypesAllowedRating] {
-	val entityName: String = "MEM_TYPES_ALLOWED_RATINGS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/MemTypesApClassType.scala b/entity-templates/MemTypesApClassType.scala
deleted file mode 100644
index 056b3b2c..00000000
--- a/entity-templates/MemTypesApClassType.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MemTypesApClassType extends StorableClass(MemTypesApClassType) {
-	object values extends ValuesObject {
-		val membershipTypeId = new IntFieldValue(self, MemTypesApClassType.fields.membershipTypeId)
-		val apClassTypeId = new IntFieldValue(self, MemTypesApClassType.fields.apClassTypeId)
-	}
-}
-
-object MemTypesApClassType extends StorableObject[MemTypesApClassType] {
-	val entityName: String = "MEM_TYPES_AP_CLASS_TYPES"
-
-	object fields extends FieldsObject {
-		val membershipTypeId = new IntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val apClassTypeId = new IntDatabaseField(self, "AP_CLASS_TYPE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.membershipTypeId
-}
\ No newline at end of file
diff --git a/entity-templates/MembershipPrice.scala b/entity-templates/MembershipPrice.scala
deleted file mode 100644
index d76dca1a..00000000
--- a/entity-templates/MembershipPrice.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MembershipPrice extends StorableClass(MembershipPrice) {
-	object values extends ValuesObject {
-		val instanceId = new IntFieldValue(self, MembershipPrice.fields.instanceId)
-		val membershipTypeId = new NullableIntFieldValue(self, MembershipPrice.fields.membershipTypeId)
-		val price = new NullableDoubleFieldValue(self, MembershipPrice.fields.price)
-		val startActive = new NullableLocalDateTimeFieldValue(self, MembershipPrice.fields.startActive)
-		val endActive = new NullableLocalDateTimeFieldValue(self, MembershipPrice.fields.endActive)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MembershipPrice.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MembershipPrice.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MembershipPrice.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MembershipPrice.fields.updatedBy)
-	}
-}
-
-object MembershipPrice extends StorableObject[MembershipPrice] {
-	val entityName: String = "MEMBERSHIP_PRICES"
-
-	object fields extends FieldsObject {
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val startActive = new NullableLocalDateTimeDatabaseField(self, "START_ACTIVE")
-		val endActive = new NullableLocalDateTimeDatabaseField(self, "END_ACTIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.instanceId
-}
\ No newline at end of file
diff --git a/entity-templates/MembershipType.scala b/entity-templates/MembershipType.scala
deleted file mode 100644
index 22e915b1..00000000
--- a/entity-templates/MembershipType.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MembershipType extends StorableClass(MembershipType) {
-	object values extends ValuesObject {
-		val membershipTypeId = new IntFieldValue(self, MembershipType.fields.membershipTypeId)
-		val programId = new NullableIntFieldValue(self, MembershipType.fields.programId)
-		val membershipTypeName = new NullableStringFieldValue(self, MembershipType.fields.membershipTypeName)
-		val displayOrder = new NullableDoubleFieldValue(self, MembershipType.fields.displayOrder)
-		val active = new NullableBooleanFIeldValue(self, MembershipType.fields.active)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MembershipType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MembershipType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MembershipType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MembershipType.fields.updatedBy)
-		val duration = new NullableDoubleFieldValue(self, MembershipType.fields.duration)
-		val expirationType = new NullableStringFieldValue(self, MembershipType.fields.expirationType)
-		val price = new NullableDoubleFieldValue(self, MembershipType.fields.price)
-		val oldDiscountType = new NullableDoubleFieldValue(self, MembershipType.fields.oldDiscountType)
-		val regCodeRowId = new NullableIntFieldValue(self, MembershipType.fields.regCodeRowId)
-		val alertOnClose = new NullableBooleanFIeldValue(self, MembershipType.fields.alertOnClose)
-		val gcEligible = new NullableBooleanFIeldValue(self, MembershipType.fields.gcEligible)
-		val membershipTypeDisplayName = new NullableStringFieldValue(self, MembershipType.fields.membershipTypeDisplayName)
-		val availableOnline = new NullableBooleanFIeldValue(self, MembershipType.fields.availableOnline)
-		val canHaveGuestPrivs = new NullableBooleanFIeldValue(self, MembershipType.fields.canHaveGuestPrivs)
-		val gcRegCodeRowId = new NullableIntFieldValue(self, MembershipType.fields.gcRegCodeRowId)
-		val ratingsRestricted = new NullableBooleanFIeldValue(self, MembershipType.fields.ratingsRestricted)
-		val taxable = new NullableBooleanFIeldValue(self, MembershipType.fields.taxable)
-		val programPriority = new NullableDoubleFieldValue(self, MembershipType.fields.programPriority)
-		val renewalEligible = new NullableBooleanFIeldValue(self, MembershipType.fields.renewalEligible)
-	}
-}
-
-object MembershipType extends StorableObject[MembershipType] {
-	val entityName: String = "MEMBERSHIP_TYPES"
-
-	object fields extends FieldsObject {
-		val membershipTypeId = new IntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val programId = new NullableIntDatabaseField(self, "PROGRAM_ID")
-		val membershipTypeName = new NullableStringDatabaseField(self, "MEMBERSHIP_TYPE_NAME", 200)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val duration = new NullableDoubleDatabaseField(self, "DURATION")
-		val expirationType = new NullableStringDatabaseField(self, "EXPIRATION_TYPE", 50)
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val oldDiscountType = new NullableDoubleDatabaseField(self, "OLD_DISCOUNT_TYPE")
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-		val alertOnClose = new NullableBooleanDatabaseField(self, "ALERT_ON_CLOSE")
-		val gcEligible = new NullableBooleanDatabaseField(self, "GC_ELIGIBLE")
-		val membershipTypeDisplayName = new NullableStringDatabaseField(self, "MEMBERSHIP_TYPE_DISPLAY_NAME", 100)
-		val availableOnline = new NullableBooleanDatabaseField(self, "AVAILABLE_ONLINE")
-		val canHaveGuestPrivs = new NullableBooleanDatabaseField(self, "CAN_HAVE_GUEST_PRIVS")
-		val gcRegCodeRowId = new NullableIntDatabaseField(self, "GC_REG_CODE_ROW_ID")
-		val ratingsRestricted = new NullableBooleanDatabaseField(self, "RATINGS_RESTRICTED")
-		val taxable = new NullableBooleanDatabaseField(self, "TAXABLE")
-		val programPriority = new NullableDoubleDatabaseField(self, "PROGRAM_PRIORITY")
-		val renewalEligible = new NullableBooleanDatabaseField(self, "RENEWAL_ELIGIBLE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.membershipTypeId
-}
\ No newline at end of file
diff --git a/entity-templates/MembershipTypeDiscount.scala b/entity-templates/MembershipTypeDiscount.scala
deleted file mode 100644
index b9254c9a..00000000
--- a/entity-templates/MembershipTypeDiscount.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MembershipTypeDiscount extends StorableClass(MembershipTypeDiscount) {
-	object values extends ValuesObject {
-		val discountId = new IntFieldValue(self, MembershipTypeDiscount.fields.discountId)
-		val membershipTypeId = new NullableIntFieldValue(self, MembershipTypeDiscount.fields.membershipTypeId)
-		val discountAmt = new NullableDoubleFieldValue(self, MembershipTypeDiscount.fields.discountAmt)
-		val description = new NullableStringFieldValue(self, MembershipTypeDiscount.fields.description)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MembershipTypeDiscount.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MembershipTypeDiscount.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MembershipTypeDiscount.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MembershipTypeDiscount.fields.updatedBy)
-		val regCodeRowId = new NullableIntFieldValue(self, MembershipTypeDiscount.fields.regCodeRowId)
-	}
-}
-
-object MembershipTypeDiscount extends StorableObject[MembershipTypeDiscount] {
-	val entityName: String = "MEMBERSHIP_TYPE_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val discountId = new IntDatabaseField(self, "DISCOUNT_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.discountId
-}
\ No newline at end of file
diff --git a/entity-templates/MembershipTypeExp.scala b/entity-templates/MembershipTypeExp.scala
deleted file mode 100644
index 7045e638..00000000
--- a/entity-templates/MembershipTypeExp.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MembershipTypeExp extends StorableClass(MembershipTypeExp) {
-	object values extends ValuesObject {
-		val expirationId = new IntFieldValue(self, MembershipTypeExp.fields.expirationId)
-		val membershipTypeId = new IntFieldValue(self, MembershipTypeExp.fields.membershipTypeId)
-		val season = new DoubleFieldValue(self, MembershipTypeExp.fields.season)
-		val expirationDate = new LocalDateTimeFieldValue(self, MembershipTypeExp.fields.expirationDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MembershipTypeExp.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MembershipTypeExp.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MembershipTypeExp.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MembershipTypeExp.fields.updatedBy)
-		val startDate = new LocalDateTimeFieldValue(self, MembershipTypeExp.fields.startDate)
-	}
-}
-
-object MembershipTypeExp extends StorableObject[MembershipTypeExp] {
-	val entityName: String = "MEMBERSHIP_TYPE_EXP"
-
-	object fields extends FieldsObject {
-		val expirationId = new IntDatabaseField(self, "EXPIRATION_ID")
-		val membershipTypeId = new IntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val season = new DoubleDatabaseField(self, "SEASON")
-		val expirationDate = new LocalDateTimeDatabaseField(self, "EXPIRATION_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val startDate = new LocalDateTimeDatabaseField(self, "START_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.expirationId
-}
\ No newline at end of file
diff --git a/entity-templates/MembershipsDiscount.scala b/entity-templates/MembershipsDiscount.scala
deleted file mode 100644
index e1caf595..00000000
--- a/entity-templates/MembershipsDiscount.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MembershipsDiscount extends StorableClass(MembershipsDiscount) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, MembershipsDiscount.fields.assignId)
-		val typeId = new IntFieldValue(self, MembershipsDiscount.fields.typeId)
-		val instanceId = new NullableIntFieldValue(self, MembershipsDiscount.fields.instanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, MembershipsDiscount.fields.discountAmt)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MembershipsDiscount.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MembershipsDiscount.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MembershipsDiscount.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MembershipsDiscount.fields.updatedBy)
-		val regCodeRowId = new NullableIntFieldValue(self, MembershipsDiscount.fields.regCodeRowId)
-		val arSourceId = new NullableIntFieldValue(self, MembershipsDiscount.fields.arSourceId)
-		val arAmount = new NullableDoubleFieldValue(self, MembershipsDiscount.fields.arAmount)
-		val autoGrant = new NullableBooleanFIeldValue(self, MembershipsDiscount.fields.autoGrant)
-		val freeGp = new NullableBooleanFIeldValue(self, MembershipsDiscount.fields.freeGp)
-		val freeDw = new NullableBooleanFIeldValue(self, MembershipsDiscount.fields.freeDw)
-	}
-}
-
-object MembershipsDiscount extends StorableObject[MembershipsDiscount] {
-	val entityName: String = "MEMBERSHIPS_DISCOUNTS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID")
-		val arSourceId = new NullableIntDatabaseField(self, "AR_SOURCE_ID")
-		val arAmount = new NullableDoubleDatabaseField(self, "AR_AMOUNT")
-		val autoGrant = new NullableBooleanDatabaseField(self, "AUTO_GRANT")
-		val freeGp = new NullableBooleanDatabaseField(self, "FREE_GP")
-		val freeDw = new NullableBooleanDatabaseField(self, "FREE_DW")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/MergeHistory.scala b/entity-templates/MergeHistory.scala
deleted file mode 100644
index 90a290ea..00000000
--- a/entity-templates/MergeHistory.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MergeHistory extends StorableClass(MergeHistory) {
-	object values extends ValuesObject {
-		val actionId = new IntFieldValue(self, MergeHistory.fields.actionId)
-		val oldId = new NullableIntFieldValue(self, MergeHistory.fields.oldId)
-		val newId = new NullableIntFieldValue(self, MergeHistory.fields.newId)
-		val tableName = new NullableStringFieldValue(self, MergeHistory.fields.tableName)
-		val columnName = new NullableStringFieldValue(self, MergeHistory.fields.columnName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, MergeHistory.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, MergeHistory.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, MergeHistory.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, MergeHistory.fields.updatedBy)
-		val tablePk = new NullableDoubleFieldValue(self, MergeHistory.fields.tablePk)
-	}
-}
-
-object MergeHistory extends StorableObject[MergeHistory] {
-	val entityName: String = "MERGE_HISTORY"
-
-	object fields extends FieldsObject {
-		val actionId = new IntDatabaseField(self, "ACTION_ID")
-		val oldId = new NullableIntDatabaseField(self, "OLD_ID")
-		val newId = new NullableIntDatabaseField(self, "NEW_ID")
-		val tableName = new NullableStringDatabaseField(self, "TABLE_NAME", 500)
-		val columnName = new NullableStringDatabaseField(self, "COLUMN_NAME", 500)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val tablePk = new NullableDoubleDatabaseField(self, "TABLE_PK")
-	}
-
-	def primaryKey: IntDatabaseField = fields.actionId
-}
\ No newline at end of file
diff --git a/entity-templates/MostRecentSignout.scala b/entity-templates/MostRecentSignout.scala
deleted file mode 100644
index 3f2e66aa..00000000
--- a/entity-templates/MostRecentSignout.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class MostRecentSignout extends StorableClass(MostRecentSignout) {
-	object values extends ValuesObject {
-		val boatId = new IntFieldValue(self, MostRecentSignout.fields.boatId)
-		val sailNumber = new NullableStringFieldValue(self, MostRecentSignout.fields.sailNumber)
-		val signoutId = new IntFieldValue(self, MostRecentSignout.fields.signoutId)
-	}
-}
-
-object MostRecentSignout extends StorableObject[MostRecentSignout] {
-	val entityName: String = "MOST_RECENT_SIGNOUTS"
-
-	object fields extends FieldsObject {
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val sailNumber = new NullableStringDatabaseField(self, "SAIL_NUMBER", 15)
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/OneDaySignoutsToday.scala b/entity-templates/OneDaySignoutsToday.scala
deleted file mode 100644
index 2ce68ee9..00000000
--- a/entity-templates/OneDaySignoutsToday.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OneDaySignoutsToday extends StorableClass(OneDaySignoutsToday) {
-	object values extends ValuesObject {
-		val signoutId = new IntFieldValue(self, OneDaySignoutsToday.fields.signoutId)
-	}
-}
-
-object OneDaySignoutsToday extends StorableObject[OneDaySignoutsToday] {
-	val entityName: String = "ONE_DAY_SIGNOUTS_TODAY"
-
-	object fields extends FieldsObject {
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/OpenStaggeredOrder.scala b/entity-templates/OpenStaggeredOrder.scala
deleted file mode 100644
index 10d9a141..00000000
--- a/entity-templates/OpenStaggeredOrder.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OpenStaggeredOrder extends StorableClass(OpenStaggeredOrder) {
-	object values extends ValuesObject {
-		val orderId = new NullableIntFieldValue(self, OpenStaggeredOrder.fields.orderId)
-		val firstPayment = new NullableLocalDateTimeFieldValue(self, OpenStaggeredOrder.fields.firstPayment)
-		val lastPayment = new NullableLocalDateTimeFieldValue(self, OpenStaggeredOrder.fields.lastPayment)
-	}
-}
-
-object OpenStaggeredOrder extends StorableObject[OpenStaggeredOrder] {
-	val entityName: String = "OPEN_STAGGERED_ORDERS"
-
-	object fields extends FieldsObject {
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val firstPayment = new NullableLocalDateTimeDatabaseField(self, "FIRST_PAYMENT")
-		val lastPayment = new NullableLocalDateTimeDatabaseField(self, "LAST_PAYMENT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/OptOutGroup.scala b/entity-templates/OptOutGroup.scala
deleted file mode 100644
index 3a560833..00000000
--- a/entity-templates/OptOutGroup.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OptOutGroup extends StorableClass(OptOutGroup) {
-	object values extends ValuesObject {
-		val optOutGrpId = new IntFieldValue(self, OptOutGroup.fields.optOutGrpId)
-		val groupName = new NullableStringFieldValue(self, OptOutGroup.fields.groupName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, OptOutGroup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, OptOutGroup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, OptOutGroup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, OptOutGroup.fields.updatedBy)
-	}
-}
-
-object OptOutGroup extends StorableObject[OptOutGroup] {
-	val entityName: String = "OPT_OUT_GROUPS"
-
-	object fields extends FieldsObject {
-		val optOutGrpId = new IntDatabaseField(self, "OPT_OUT_GRP_ID")
-		val groupName = new NullableStringDatabaseField(self, "GROUP_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.optOutGrpId
-}
\ No newline at end of file
diff --git a/entity-templates/OptOutRequest.scala b/entity-templates/OptOutRequest.scala
deleted file mode 100644
index 492444b3..00000000
--- a/entity-templates/OptOutRequest.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OptOutRequest extends StorableClass(OptOutRequest) {
-	object values extends ValuesObject {
-		val reqId = new IntFieldValue(self, OptOutRequest.fields.reqId)
-		val email = new NullableStringFieldValue(self, OptOutRequest.fields.email)
-		val optOutGrpId = new NullableIntFieldValue(self, OptOutRequest.fields.optOutGrpId)
-		val doNotSend = new NullableBooleanFIeldValue(self, OptOutRequest.fields.doNotSend)
-		val token = new NullableStringFieldValue(self, OptOutRequest.fields.token)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, OptOutRequest.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, OptOutRequest.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, OptOutRequest.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, OptOutRequest.fields.updatedBy)
-	}
-}
-
-object OptOutRequest extends StorableObject[OptOutRequest] {
-	val entityName: String = "OPT_OUT_REQUESTS"
-
-	object fields extends FieldsObject {
-		val reqId = new IntDatabaseField(self, "REQ_ID")
-		val email = new NullableStringDatabaseField(self, "EMAIL", 500)
-		val optOutGrpId = new NullableIntDatabaseField(self, "OPT_OUT_GRP_ID")
-		val doNotSend = new NullableBooleanDatabaseField(self, "DO_NOT_SEND")
-		val token = new NullableStringDatabaseField(self, "TOKEN", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.reqId
-}
\ No newline at end of file
diff --git a/entity-templates/OrderNumber.scala b/entity-templates/OrderNumber.scala
deleted file mode 100644
index ac98a063..00000000
--- a/entity-templates/OrderNumber.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OrderNumber extends StorableClass(OrderNumber) {
-	object values extends ValuesObject {
-		val orderId = new IntFieldValue(self, OrderNumber.fields.orderId)
-		val personId = new IntFieldValue(self, OrderNumber.fields.personId)
-		val orderNum = new StringFieldValue(self, OrderNumber.fields.orderNum)
-		val approvedTransId = new NullableIntFieldValue(self, OrderNumber.fields.approvedTransId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, OrderNumber.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, OrderNumber.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, OrderNumber.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, OrderNumber.fields.updatedBy)
-		val processedDate = new NullableLocalDateTimeFieldValue(self, OrderNumber.fields.processedDate)
-		val approvedStripeChargeAtt = new NullableDoubleFieldValue(self, OrderNumber.fields.approvedStripeChargeAtt)
-		val addlStaggeredPayments = new NullableDoubleFieldValue(self, OrderNumber.fields.addlStaggeredPayments)
-		val appAlias = new NullableStringFieldValue(self, OrderNumber.fields.appAlias)
-		val usePaymentIntent = new NullableBooleanFIeldValue(self, OrderNumber.fields.usePaymentIntent)
-	}
-}
-
-object OrderNumber extends StorableObject[OrderNumber] {
-	val entityName: String = "ORDER_NUMBERS"
-
-	object fields extends FieldsObject {
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val orderNum = new StringDatabaseField(self, "ORDER_NUM", 25)
-		val approvedTransId = new NullableIntDatabaseField(self, "APPROVED_TRANS_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val processedDate = new NullableLocalDateTimeDatabaseField(self, "PROCESSED_DATE")
-		val approvedStripeChargeAtt = new NullableDoubleDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT")
-		val addlStaggeredPayments = new NullableDoubleDatabaseField(self, "ADDL_STAGGERED_PAYMENTS")
-		val appAlias = new NullableStringDatabaseField(self, "APP_ALIAS", 20)
-		val usePaymentIntent = new NullableBooleanDatabaseField(self, "USE_PAYMENT_INTENT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.orderId
-}
\ No newline at end of file
diff --git a/entity-templates/OrderStaggeredPayment.scala b/entity-templates/OrderStaggeredPayment.scala
deleted file mode 100644
index 6e95a74c..00000000
--- a/entity-templates/OrderStaggeredPayment.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OrderStaggeredPayment extends StorableClass(OrderStaggeredPayment) {
-	object values extends ValuesObject {
-		val staggerId = new IntFieldValue(self, OrderStaggeredPayment.fields.staggerId)
-		val orderId = new IntFieldValue(self, OrderStaggeredPayment.fields.orderId)
-		val seq = new DoubleFieldValue(self, OrderStaggeredPayment.fields.seq)
-		val expectedPaymentDate = new LocalDateTimeFieldValue(self, OrderStaggeredPayment.fields.expectedPaymentDate)
-		val paid = new BooleanFIeldValue(self, OrderStaggeredPayment.fields.paid)
-		val approvedStripeChargeAtt = new NullableDoubleFieldValue(self, OrderStaggeredPayment.fields.approvedStripeChargeAtt)
-		val paidCloseId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.paidCloseId)
-		val redeemedCloseId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.redeemedCloseId)
-		val rawAmountInCents = new NullableDoubleFieldValue(self, OrderStaggeredPayment.fields.rawAmountInCents)
-		val addlAmountInCents = new NullableDoubleFieldValue(self, OrderStaggeredPayment.fields.addlAmountInCents)
-		val paymentIntentRowId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.paymentIntentRowId)
-		val failedCron = new NullableBooleanFIeldValue(self, OrderStaggeredPayment.fields.failedCron)
-	}
-}
-
-object OrderStaggeredPayment extends StorableObject[OrderStaggeredPayment] {
-	val entityName: String = "ORDER_STAGGERED_PAYMENTS"
-
-	object fields extends FieldsObject {
-		val staggerId = new IntDatabaseField(self, "STAGGER_ID")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val seq = new DoubleDatabaseField(self, "SEQ")
-		val expectedPaymentDate = new LocalDateTimeDatabaseField(self, "EXPECTED_PAYMENT_DATE")
-		val paid = new BooleanDatabaseField(self, "PAID")
-		val approvedStripeChargeAtt = new NullableDoubleDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT")
-		val paidCloseId = new NullableIntDatabaseField(self, "PAID_CLOSE_ID")
-		val redeemedCloseId = new NullableIntDatabaseField(self, "REDEEMED_CLOSE_ID")
-		val rawAmountInCents = new NullableDoubleDatabaseField(self, "RAW_AMOUNT_IN_CENTS")
-		val addlAmountInCents = new NullableDoubleDatabaseField(self, "ADDL_AMOUNT_IN_CENTS")
-		val paymentIntentRowId = new NullableIntDatabaseField(self, "PAYMENT_INTENT_ROW_ID")
-		val failedCron = new NullableBooleanDatabaseField(self, "FAILED_CRON")
-	}
-
-	def primaryKey: IntDatabaseField = fields.staggerId
-}
\ No newline at end of file
diff --git a/entity-templates/OrdersPromo.scala b/entity-templates/OrdersPromo.scala
deleted file mode 100644
index fb2649d6..00000000
--- a/entity-templates/OrdersPromo.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OrdersPromo extends StorableClass(OrdersPromo) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, OrdersPromo.fields.assignId)
-		val orderId = new NullableIntFieldValue(self, OrdersPromo.fields.orderId)
-		val instanceId = new NullableIntFieldValue(self, OrdersPromo.fields.instanceId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, OrdersPromo.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, OrdersPromo.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, OrdersPromo.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, OrdersPromo.fields.updatedBy)
-	}
-}
-
-object OrdersPromo extends StorableObject[OrdersPromo] {
-	val entityName: String = "ORDERS_PROMOS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/OrdersStripePaymentIntent.scala b/entity-templates/OrdersStripePaymentIntent.scala
deleted file mode 100644
index df97daf3..00000000
--- a/entity-templates/OrdersStripePaymentIntent.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class OrdersStripePaymentIntent extends StorableClass(OrdersStripePaymentIntent) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.rowId)
-		val orderId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.orderId)
-		val paymentIntentId = new StringFieldValue(self, OrdersStripePaymentIntent.fields.paymentIntentId)
-		val amountInCents = new DoubleFieldValue(self, OrdersStripePaymentIntent.fields.amountInCents)
-		val paid = new BooleanFIeldValue(self, OrdersStripePaymentIntent.fields.paid)
-		val paidCloseId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.paidCloseId)
-	}
-}
-
-object OrdersStripePaymentIntent extends StorableObject[OrdersStripePaymentIntent] {
-	val entityName: String = "ORDERS_STRIPE_PAYMENT_INTENTS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val paymentIntentId = new StringDatabaseField(self, "PAYMENT_INTENT_ID", 50)
-		val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val paid = new BooleanDatabaseField(self, "PAID")
-		val paidCloseId = new IntDatabaseField(self, "PAID_CLOSE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/Pa.scala b/entity-templates/Pa.scala
deleted file mode 100644
index dc62d03b..00000000
--- a/entity-templates/Pa.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Pa extends StorableClass(Pa) {
-	object values extends ValuesObject {
-		val pasId = new IntFieldValue(self, Pa.fields.pasId)
-		val userName = new NullableStringFieldValue(self, Pa.fields.userName)
-		val pas = new NullableStringFieldValue(self, Pa.fields.pas)
-		val expiration = new NullableLocalDateTimeFieldValue(self, Pa.fields.expiration)
-		val procName = new NullableStringFieldValue(self, Pa.fields.procName)
-		val argString = new NullableStringFieldValue(self, Pa.fields.argString)
-	}
-}
-
-object Pa extends StorableObject[Pa] {
-	val entityName: String = "PAS"
-
-	object fields extends FieldsObject {
-		val pasId = new IntDatabaseField(self, "PAS_ID")
-		val userName = new NullableStringDatabaseField(self, "USER_NAME", 100)
-		val pas = new NullableStringDatabaseField(self, "PAS", 100)
-		val expiration = new NullableLocalDateTimeDatabaseField(self, "EXPIRATION")
-		val procName = new NullableStringDatabaseField(self, "PROC_NAME", 100)
-		val argString = new NullableStringDatabaseField(self, "ARG_STRING", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.pasId
-}
\ No newline at end of file
diff --git a/entity-templates/PendingMembership.scala b/entity-templates/PendingMembership.scala
deleted file mode 100644
index 0f86c179..00000000
--- a/entity-templates/PendingMembership.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PendingMembership extends StorableClass(PendingMembership) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, PendingMembership.fields.personId)
-		val membershipTypeId = new NullableIntFieldValue(self, PendingMembership.fields.membershipTypeId)
-		val firstPayment = new NullableLocalDateTimeFieldValue(self, PendingMembership.fields.firstPayment)
-		val lastPayment = new NullableLocalDateTimeFieldValue(self, PendingMembership.fields.lastPayment)
-		val orderId = new NullableIntFieldValue(self, PendingMembership.fields.orderId)
-	}
-}
-
-object PendingMembership extends StorableObject[PendingMembership] {
-	val entityName: String = "PENDING_MEMBERSHIPS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val firstPayment = new NullableLocalDateTimeDatabaseField(self, "FIRST_PAYMENT")
-		val lastPayment = new NullableLocalDateTimeDatabaseField(self, "LAST_PAYMENT")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/PerformanceLog.scala b/entity-templates/PerformanceLog.scala
deleted file mode 100644
index b5d41166..00000000
--- a/entity-templates/PerformanceLog.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PerformanceLog extends StorableClass(PerformanceLog) {
-	object values extends ValuesObject {
-		val logId = new IntFieldValue(self, PerformanceLog.fields.logId)
-		val appId = new NullableIntFieldValue(self, PerformanceLog.fields.appId)
-		val connectTime = new NullableDoubleFieldValue(self, PerformanceLog.fields.connectTime)
-		val requestTime = new NullableDoubleFieldValue(self, PerformanceLog.fields.requestTime)
-		val responseTime = new NullableDoubleFieldValue(self, PerformanceLog.fields.responseTime)
-		val processTime = new NullableDoubleFieldValue(self, PerformanceLog.fields.processTime)
-		val totalTime = new NullableDoubleFieldValue(self, PerformanceLog.fields.totalTime)
-		val logDatetime = new NullableLocalDateTimeFieldValue(self, PerformanceLog.fields.logDatetime)
-		val userName = new NullableStringFieldValue(self, PerformanceLog.fields.userName)
-	}
-}
-
-object PerformanceLog extends StorableObject[PerformanceLog] {
-	val entityName: String = "PERFORMANCE_LOG"
-
-	object fields extends FieldsObject {
-		val logId = new IntDatabaseField(self, "LOG_ID")
-		val appId = new NullableIntDatabaseField(self, "APP_ID")
-		val connectTime = new NullableDoubleDatabaseField(self, "CONNECT_TIME")
-		val requestTime = new NullableDoubleDatabaseField(self, "REQUEST_TIME")
-		val responseTime = new NullableDoubleDatabaseField(self, "RESPONSE_TIME")
-		val processTime = new NullableDoubleDatabaseField(self, "PROCESS_TIME")
-		val totalTime = new NullableDoubleDatabaseField(self, "TOTAL_TIME")
-		val logDatetime = new NullableLocalDateTimeDatabaseField(self, "LOG_DATETIME")
-		val userName = new NullableStringDatabaseField(self, "USER_NAME", 100)
-	}
-
-	def primaryKey: IntDatabaseField = fields.logId
-}
\ No newline at end of file
diff --git a/entity-templates/Person.scala b/entity-templates/Person.scala
deleted file mode 100644
index 74353c47..00000000
--- a/entity-templates/Person.scala
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Person extends StorableClass(Person) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, Person.fields.personId)
-		val nameFirst = new NullableStringFieldValue(self, Person.fields.nameFirst)
-		val nameMiddleInitial = new NullableStringFieldValue(self, Person.fields.nameMiddleInitial)
-		val nameLast = new NullableStringFieldValue(self, Person.fields.nameLast)
-		val namePrefix = new NullableStringFieldValue(self, Person.fields.namePrefix)
-		val nameSuffix = new NullableStringFieldValue(self, Person.fields.nameSuffix)
-		val gender = new NullableBooleanFIeldValue(self, Person.fields.gender)
-		val dob = new NullableLocalDateTimeFieldValue(self, Person.fields.dob)
-		val email = new NullableStringFieldValue(self, Person.fields.email)
-		val parentEmail = new NullableStringFieldValue(self, Person.fields.parentEmail)
-		val addr1 = new NullableStringFieldValue(self, Person.fields.addr1)
-		val addr2 = new NullableStringFieldValue(self, Person.fields.addr2)
-		val addr3 = new NullableStringFieldValue(self, Person.fields.addr3)
-		val city = new NullableStringFieldValue(self, Person.fields.city)
-		val state = new NullableStringFieldValue(self, Person.fields.state)
-		val zip = new NullableStringFieldValue(self, Person.fields.zip)
-		val country = new NullableStringFieldValue(self, Person.fields.country)
-		val phonePrimary = new NullableStringFieldValue(self, Person.fields.phonePrimary)
-		val phonePrimaryType = new NullableStringFieldValue(self, Person.fields.phonePrimaryType)
-		val phoneAlternate = new NullableStringFieldValue(self, Person.fields.phoneAlternate)
-		val phoneAlternateType = new NullableStringFieldValue(self, Person.fields.phoneAlternateType)
-		val emerg1Name = new NullableStringFieldValue(self, Person.fields.emerg1Name)
-		val emerg1Relation = new NullableStringFieldValue(self, Person.fields.emerg1Relation)
-		val emerg1PhonePrimary = new NullableStringFieldValue(self, Person.fields.emerg1PhonePrimary)
-		val emerg1PhoneAlternate = new NullableStringFieldValue(self, Person.fields.emerg1PhoneAlternate)
-		val emerg2Name = new NullableStringFieldValue(self, Person.fields.emerg2Name)
-		val emerg2Relation = new NullableStringFieldValue(self, Person.fields.emerg2Relation)
-		val emerg2PhonePrimary = new NullableStringFieldValue(self, Person.fields.emerg2PhonePrimary)
-		val emerg2PhoneAlternate = new NullableStringFieldValue(self, Person.fields.emerg2PhoneAlternate)
-		val allergies = new NullableStringFieldValue(self, Person.fields.allergies)
-		val medications = new NullableStringFieldValue(self, Person.fields.medications)
-		val specialNeeds = new NullableStringFieldValue(self, Person.fields.specialNeeds)
-		val badMail = new NullableBooleanFIeldValue(self, Person.fields.badMail)
-		val deceased = new NullableBooleanFIeldValue(self, Person.fields.deceased)
-		val doNotCall = new NullableBooleanFIeldValue(self, Person.fields.doNotCall)
-		val doNotEmail = new NullableBooleanFIeldValue(self, Person.fields.doNotEmail)
-		val doNotMail = new NullableBooleanFIeldValue(self, Person.fields.doNotMail)
-		val occupation = new NullableStringFieldValue(self, Person.fields.occupation)
-		val employer = new NullableStringFieldValue(self, Person.fields.employer)
-		val matchingGifts = new NullableBooleanFIeldValue(self, Person.fields.matchingGifts)
-		val citizenship = new NullableStringFieldValue(self, Person.fields.citizenship)
-		val ethnicity = new NullableStringFieldValue(self, Person.fields.ethnicity)
-		val language = new NullableStringFieldValue(self, Person.fields.language)
-		val referralSource = new NullableStringFieldValue(self, Person.fields.referralSource)
-		val sailingExp = new NullableStringFieldValue(self, Person.fields.sailingExp)
-		val organization = new NullableStringFieldValue(self, Person.fields.organization)
-		val orgContact = new NullableStringFieldValue(self, Person.fields.orgContact)
-		val student = new NullableBooleanFIeldValue(self, Person.fields.student)
-		val school = new NullableStringFieldValue(self, Person.fields.school)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Person.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Person.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Person.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Person.fields.updatedBy)
-		val ethnicityOther = new NullableStringFieldValue(self, Person.fields.ethnicityOther)
-		val referralOther = new NullableStringFieldValue(self, Person.fields.referralOther)
-		val allowSignouts = new NullableBooleanFIeldValue(self, Person.fields.allowSignouts)
-		val sendAlert = new NullableBooleanFIeldValue(self, Person.fields.sendAlert)
-		val temp = new BooleanFIeldValue(self, Person.fields.temp)
-		val personType = new NullableDoubleFieldValue(self, Person.fields.personType)
-		val emerg1PhonePrimaryType = new NullableStringFieldValue(self, Person.fields.emerg1PhonePrimaryType)
-		val emerg1PhoneAlternateType = new NullableStringFieldValue(self, Person.fields.emerg1PhoneAlternateType)
-		val emerg2PhonePrimaryType = new NullableStringFieldValue(self, Person.fields.emerg2PhonePrimaryType)
-		val emerg2PhoneAlternateType = new NullableStringFieldValue(self, Person.fields.emerg2PhoneAlternateType)
-		val badPhone = new NullableBooleanFIeldValue(self, Person.fields.badPhone)
-		val badEmail = new NullableBooleanFIeldValue(self, Person.fields.badEmail)
-		val military = new NullableStringFieldValue(self, Person.fields.military)
-		val reducedLunch = new NullableBooleanFIeldValue(self, Person.fields.reducedLunch)
-		val pwHash = new NullableStringFieldValue(self, Person.fields.pwHash)
-		val incomeLevel = new NullableDoubleFieldValue(self, Person.fields.incomeLevel)
-		val swimProof = new NullableDoubleFieldValue(self, Person.fields.swimProof)
-		val oldFundraisingGreeting = new NullableStringFieldValue(self, Person.fields.oldFundraisingGreeting)
-		val oldPhoneWork = new NullableStringFieldValue(self, Person.fields.oldPhoneWork)
-		val languageOther = new NullableStringFieldValue(self, Person.fields.languageOther)
-		val dobVerified = new NullableBooleanFIeldValue(self, Person.fields.dobVerified)
-		val prevMember = new NullableBooleanFIeldValue(self, Person.fields.prevMember)
-		val prevCard = new NullableStringFieldValue(self, Person.fields.prevCard)
-		val jpAgeOverride = new NullableBooleanFIeldValue(self, Person.fields.jpAgeOverride)
-		val mergeStatus = new NullableBooleanFIeldValue(self, Person.fields.mergeStatus)
-		val incomeAmt = new NullableDoubleFieldValue(self, Person.fields.incomeAmt)
-		val incomeAmtRaw = new NullableStringFieldValue(self, Person.fields.incomeAmtRaw)
-		val specNeedsVerified = new NullableBooleanFIeldValue(self, Person.fields.specNeedsVerified)
-		val memberComment = new NullableUnknownFieldType(self, Person.fields.memberComment)
-		val verifiedEmail = new NullableStringFieldValue(self, Person.fields.verifiedEmail)
-		val uapBoat = new NullableDoubleFieldValue(self, Person.fields.uapBoat)
-		val ignoreJpMinAge = new NullableBooleanFIeldValue(self, Person.fields.ignoreJpMinAge)
-		val uapInterestedLessons = new NullableBooleanFIeldValue(self, Person.fields.uapInterestedLessons)
-		val uapInterestedRides = new NullableBooleanFIeldValue(self, Person.fields.uapInterestedRides)
-		val entityType = new NullableBooleanFIeldValue(self, Person.fields.entityType)
-		val jpTeamId = new NullableIntFieldValue(self, Person.fields.jpTeamId)
-		val guestPortalReg = new NullableBooleanFIeldValue(self, Person.fields.guestPortalReg)
-		val signoutBlockReason = new NullableUnknownFieldType(self, Person.fields.signoutBlockReason)
-		val dataUnconfirmed = new NullableBooleanFIeldValue(self, Person.fields.dataUnconfirmed)
-		val campFair = new NullableStringFieldValue(self, Person.fields.campFair)
-		val previousMember = new NullableBooleanFIeldValue(self, Person.fields.previousMember)
-		val protopersonCookie = new NullableStringFieldValue(self, Person.fields.protopersonCookie)
-		val protoState = new NullableBooleanFIeldValue(self, Person.fields.protoState)
-		val veteranEligible = new NullableBooleanFIeldValue(self, Person.fields.veteranEligible)
-		val stripeCustomerId = new NullableStringFieldValue(self, Person.fields.stripeCustomerId)
-		val hasAuthedAs = new NullableDoubleFieldValue(self, Person.fields.hasAuthedAs)
-		val pwHashScheme = new NullableStringFieldValue(self, Person.fields.pwHashScheme)
-		val nextRecurringDonation = new NullableLocalDateTimeFieldValue(self, Person.fields.nextRecurringDonation)
-	}
-}
-
-object Person extends StorableObject[Person] {
-	val entityName: String = "PERSONS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameMiddleInitial = new NullableStringDatabaseField(self, "NAME_MIDDLE_INITIAL", 5)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val namePrefix = new NullableStringDatabaseField(self, "NAME_PREFIX", 50)
-		val nameSuffix = new NullableStringDatabaseField(self, "NAME_SUFFIX", 50)
-		val gender = new NullableBooleanDatabaseField(self, "GENDER")
-		val dob = new NullableLocalDateTimeDatabaseField(self, "DOB")
-		val email = new NullableStringDatabaseField(self, "EMAIL", 100)
-		val parentEmail = new NullableStringDatabaseField(self, "PARENT_EMAIL", 100)
-		val addr1 = new NullableStringDatabaseField(self, "ADDR_1", 200)
-		val addr2 = new NullableStringDatabaseField(self, "ADDR_2", 200)
-		val addr3 = new NullableStringDatabaseField(self, "ADDR_3", 200)
-		val city = new NullableStringDatabaseField(self, "CITY", 50)
-		val state = new NullableStringDatabaseField(self, "STATE", 50)
-		val zip = new NullableStringDatabaseField(self, "ZIP", 15)
-		val country = new NullableStringDatabaseField(self, "COUNTRY", 50)
-		val phonePrimary = new NullableStringDatabaseField(self, "PHONE_PRIMARY", 100)
-		val phonePrimaryType = new NullableStringDatabaseField(self, "PHONE_PRIMARY_TYPE", 50)
-		val phoneAlternate = new NullableStringDatabaseField(self, "PHONE_ALTERNATE", 100)
-		val phoneAlternateType = new NullableStringDatabaseField(self, "PHONE_ALTERNATE_TYPE", 50)
-		val emerg1Name = new NullableStringDatabaseField(self, "EMERG1_NAME", 200)
-		val emerg1Relation = new NullableStringDatabaseField(self, "EMERG1_RELATION", 50)
-		val emerg1PhonePrimary = new NullableStringDatabaseField(self, "EMERG1_PHONE_PRIMARY", 100)
-		val emerg1PhoneAlternate = new NullableStringDatabaseField(self, "EMERG1_PHONE_ALTERNATE", 100)
-		val emerg2Name = new NullableStringDatabaseField(self, "EMERG2_NAME", 200)
-		val emerg2Relation = new NullableStringDatabaseField(self, "EMERG2_RELATION", 50)
-		val emerg2PhonePrimary = new NullableStringDatabaseField(self, "EMERG2_PHONE_PRIMARY", 100)
-		val emerg2PhoneAlternate = new NullableStringDatabaseField(self, "EMERG2_PHONE_ALTERNATE", 100)
-		val allergies = new NullableStringDatabaseField(self, "ALLERGIES", 4000)
-		val medications = new NullableStringDatabaseField(self, "MEDICATIONS", 4000)
-		val specialNeeds = new NullableStringDatabaseField(self, "SPECIAL_NEEDS", 4000)
-		val badMail = new NullableBooleanDatabaseField(self, "BAD_MAIL")
-		val deceased = new NullableBooleanDatabaseField(self, "DECEASED")
-		val doNotCall = new NullableBooleanDatabaseField(self, "DO_NOT_CALL")
-		val doNotEmail = new NullableBooleanDatabaseField(self, "DO_NOT_EMAIL")
-		val doNotMail = new NullableBooleanDatabaseField(self, "DO_NOT_MAIL")
-		val occupation = new NullableStringDatabaseField(self, "OCCUPATION", 100)
-		val employer = new NullableStringDatabaseField(self, "EMPLOYER", 100)
-		val matchingGifts = new NullableBooleanDatabaseField(self, "MATCHING_GIFTS")
-		val citizenship = new NullableStringDatabaseField(self, "CITIZENSHIP", 100)
-		val ethnicity = new NullableStringDatabaseField(self, "ETHNICITY", 100)
-		val language = new NullableStringDatabaseField(self, "LANGUAGE", 100)
-		val referralSource = new NullableStringDatabaseField(self, "REFERRAL_SOURCE", 200)
-		val sailingExp = new NullableStringDatabaseField(self, "SAILING_EXP", 100)
-		val organization = new NullableStringDatabaseField(self, "ORGANIZATION", 100)
-		val orgContact = new NullableStringDatabaseField(self, "ORG_CONTACT", 200)
-		val student = new NullableBooleanDatabaseField(self, "STUDENT")
-		val school = new NullableStringDatabaseField(self, "SCHOOL", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val ethnicityOther = new NullableStringDatabaseField(self, "ETHNICITY_OTHER", 100)
-		val referralOther = new NullableStringDatabaseField(self, "REFERRAL_OTHER", 100)
-		val allowSignouts = new NullableBooleanDatabaseField(self, "ALLOW_SIGNOUTS")
-		val sendAlert = new NullableBooleanDatabaseField(self, "SEND_ALERT")
-		val temp = new BooleanDatabaseField(self, "TEMP")
-		val personType = new NullableDoubleDatabaseField(self, "PERSON_TYPE")
-		val emerg1PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG1_PHONE_PRIMARY_TYPE", 50)
-		val emerg1PhoneAlternateType = new NullableStringDatabaseField(self, "EMERG1_PHONE_ALTERNATE_TYPE", 50)
-		val emerg2PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG2_PHONE_PRIMARY_TYPE", 50)
-		val emerg2PhoneAlternateType = new NullableStringDatabaseField(self, "EMERG2_PHONE_ALTERNATE_TYPE", 50)
-		val badPhone = new NullableBooleanDatabaseField(self, "BAD_PHONE")
-		val badEmail = new NullableBooleanDatabaseField(self, "BAD_EMAIL")
-		val military = new NullableStringDatabaseField(self, "MILITARY", 50)
-		val reducedLunch = new NullableBooleanDatabaseField(self, "REDUCED_LUNCH")
-		val pwHash = new NullableStringDatabaseField(self, "PW_HASH", 100)
-		val incomeLevel = new NullableDoubleDatabaseField(self, "INCOME_LEVEL")
-		val swimProof = new NullableDoubleDatabaseField(self, "SWIM_PROOF")
-		val oldFundraisingGreeting = new NullableStringDatabaseField(self, "OLD_FUNDRAISING_GREETING", 300)
-		val oldPhoneWork = new NullableStringDatabaseField(self, "OLD_PHONE_WORK", 50)
-		val languageOther = new NullableStringDatabaseField(self, "LANGUAGE_OTHER", 200)
-		val dobVerified = new NullableBooleanDatabaseField(self, "DOB_VERIFIED")
-		val prevMember = new NullableBooleanDatabaseField(self, "PREV_MEMBER")
-		val prevCard = new NullableStringDatabaseField(self, "PREV_CARD", 50)
-		val jpAgeOverride = new NullableBooleanDatabaseField(self, "JP_AGE_OVERRIDE")
-		val mergeStatus = new NullableBooleanDatabaseField(self, "MERGE_STATUS")
-		val incomeAmt = new NullableDoubleDatabaseField(self, "INCOME_AMT")
-		val incomeAmtRaw = new NullableStringDatabaseField(self, "INCOME_AMT_RAW", 50)
-		val specNeedsVerified = new NullableBooleanDatabaseField(self, "SPEC_NEEDS_VERIFIED")
-		val memberComment = new NullableUnknownFieldType(self, "MEMBER_COMMENT")
-		val verifiedEmail = new NullableStringDatabaseField(self, "VERIFIED_EMAIL", 1000)
-		val uapBoat = new NullableDoubleDatabaseField(self, "UAP_BOAT")
-		val ignoreJpMinAge = new NullableBooleanDatabaseField(self, "IGNORE_JP_MIN_AGE")
-		val uapInterestedLessons = new NullableBooleanDatabaseField(self, "UAP_INTERESTED_LESSONS")
-		val uapInterestedRides = new NullableBooleanDatabaseField(self, "UAP_INTERESTED_RIDES")
-		val entityType = new NullableBooleanDatabaseField(self, "ENTITY_TYPE")
-		val jpTeamId = new NullableIntDatabaseField(self, "JP_TEAM_ID")
-		val guestPortalReg = new NullableBooleanDatabaseField(self, "GUEST_PORTAL_REG")
-		val signoutBlockReason = new NullableUnknownFieldType(self, "SIGNOUT_BLOCK_REASON")
-		val dataUnconfirmed = new NullableBooleanDatabaseField(self, "DATA_UNCONFIRMED")
-		val campFair = new NullableStringDatabaseField(self, "CAMP_FAIR", 50)
-		val previousMember = new NullableBooleanDatabaseField(self, "PREVIOUS_MEMBER")
-		val protopersonCookie = new NullableStringDatabaseField(self, "PROTOPERSON_COOKIE", 50)
-		val protoState = new NullableBooleanDatabaseField(self, "PROTO_STATE")
-		val veteranEligible = new NullableBooleanDatabaseField(self, "VETERAN_ELIGIBLE")
-		val stripeCustomerId = new NullableStringDatabaseField(self, "STRIPE_CUSTOMER_ID", 30)
-		val hasAuthedAs = new NullableDoubleDatabaseField(self, "HAS_AUTHED_AS")
-		val pwHashScheme = new NullableStringDatabaseField(self, "PW_HASH_SCHEME", 20)
-		val nextRecurringDonation = new NullableLocalDateTimeDatabaseField(self, "NEXT_RECURRING_DONATION")
-	}
-
-	def primaryKey: IntDatabaseField = fields.personId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonLastExpiration.scala b/entity-templates/PersonLastExpiration.scala
deleted file mode 100644
index fbe121f6..00000000
--- a/entity-templates/PersonLastExpiration.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonLastExpiration extends StorableClass(PersonLastExpiration) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, PersonLastExpiration.fields.personId)
-		val lastExpiration = new NullableLocalDateTimeFieldValue(self, PersonLastExpiration.fields.lastExpiration)
-	}
-}
-
-object PersonLastExpiration extends StorableObject[PersonLastExpiration] {
-	val entityName: String = "PERSON_LAST_EXPIRATIONS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val lastExpiration = new NullableLocalDateTimeDatabaseField(self, "LAST_EXPIRATION")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/PersonRelationship.scala b/entity-templates/PersonRelationship.scala
deleted file mode 100644
index 2efc37a3..00000000
--- a/entity-templates/PersonRelationship.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonRelationship extends StorableClass(PersonRelationship) {
-	object values extends ValuesObject {
-		val relationId = new IntFieldValue(self, PersonRelationship.fields.relationId)
-		val a = new NullableDoubleFieldValue(self, PersonRelationship.fields.a)
-		val b = new NullableDoubleFieldValue(self, PersonRelationship.fields.b)
-		val typeId = new NullableIntFieldValue(self, PersonRelationship.fields.typeId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonRelationship.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonRelationship.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonRelationship.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonRelationship.fields.updatedBy)
-	}
-}
-
-object PersonRelationship extends StorableObject[PersonRelationship] {
-	val entityName: String = "PERSON_RELATIONSHIPS"
-
-	object fields extends FieldsObject {
-		val relationId = new IntDatabaseField(self, "RELATION_ID")
-		val a = new NullableDoubleDatabaseField(self, "A")
-		val b = new NullableDoubleDatabaseField(self, "B")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.relationId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonRelationshipType.scala b/entity-templates/PersonRelationshipType.scala
deleted file mode 100644
index 9d2f2304..00000000
--- a/entity-templates/PersonRelationshipType.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonRelationshipType extends StorableClass(PersonRelationshipType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, PersonRelationshipType.fields.typeId)
-		val aTitle = new NullableStringFieldValue(self, PersonRelationshipType.fields.aTitle)
-		val bTitle = new NullableStringFieldValue(self, PersonRelationshipType.fields.bTitle)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonRelationshipType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonRelationshipType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonRelationshipType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonRelationshipType.fields.updatedBy)
-		val acctLink = new NullableBooleanFIeldValue(self, PersonRelationshipType.fields.acctLink)
-	}
-}
-
-object PersonRelationshipType extends StorableObject[PersonRelationshipType] {
-	val entityName: String = "PERSON_RELATIONSHIP_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val aTitle = new NullableStringDatabaseField(self, "A_TITLE", 500)
-		val bTitle = new NullableStringDatabaseField(self, "B_TITLE", 500)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val acctLink = new NullableBooleanDatabaseField(self, "ACCT_LINK")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonType.scala b/entity-templates/PersonType.scala
deleted file mode 100644
index 1447b26e..00000000
--- a/entity-templates/PersonType.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonType extends StorableClass(PersonType) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, PersonType.fields.typeId)
-		val typeName = new NullableStringFieldValue(self, PersonType.fields.typeName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonType.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, PersonType.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, PersonType.fields.displayOrder)
-	}
-}
-
-object PersonType extends StorableObject[PersonType] {
-	val entityName: String = "PERSON_TYPES"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new NullableStringDatabaseField(self, "TYPE_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-	}
-
-	def primaryKey: IntDatabaseField = fields.typeId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonTypesField.scala b/entity-templates/PersonTypesField.scala
deleted file mode 100644
index 9311ffdf..00000000
--- a/entity-templates/PersonTypesField.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonTypesField extends StorableClass(PersonTypesField) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonTypesField.fields.assignId)
-		val typeId = new NullableIntFieldValue(self, PersonTypesField.fields.typeId)
-		val itemName = new NullableStringFieldValue(self, PersonTypesField.fields.itemName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonTypesField.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonTypesField.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonTypesField.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonTypesField.fields.updatedBy)
-		val display = new NullableBooleanFIeldValue(self, PersonTypesField.fields.display)
-	}
-}
-
-object PersonTypesField extends StorableObject[PersonTypesField] {
-	val entityName: String = "PERSON_TYPES_FIELDS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val typeId = new NullableIntDatabaseField(self, "TYPE_ID")
-		val itemName = new NullableStringDatabaseField(self, "ITEM_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val display = new NullableBooleanDatabaseField(self, "DISPLAY")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsBoatsFlag.scala b/entity-templates/PersonsBoatsFlag.scala
deleted file mode 100644
index dc65afe9..00000000
--- a/entity-templates/PersonsBoatsFlag.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsBoatsFlag extends StorableClass(PersonsBoatsFlag) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, PersonsBoatsFlag.fields.personId)
-		val programId = new IntFieldValue(self, PersonsBoatsFlag.fields.programId)
-		val boatId = new NullableIntFieldValue(self, PersonsBoatsFlag.fields.boatId)
-		val flag = new NullableBooleanFIeldValue(self, PersonsBoatsFlag.fields.flag)
-		val flagRank = new NullableDoubleFieldValue(self, PersonsBoatsFlag.fields.flagRank)
-	}
-}
-
-object PersonsBoatsFlag extends StorableObject[PersonsBoatsFlag] {
-	val entityName: String = "PERSONS_BOATS_FLAGS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new NullableIntDatabaseField(self, "BOAT_ID")
-		val flag = new NullableBooleanDatabaseField(self, "FLAG")
-		val flagRank = new NullableDoubleDatabaseField(self, "FLAG_RANK")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsBoatsFlagsMax.scala b/entity-templates/PersonsBoatsFlagsMax.scala
deleted file mode 100644
index 561fab02..00000000
--- a/entity-templates/PersonsBoatsFlagsMax.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsBoatsFlagsMax extends StorableClass(PersonsBoatsFlagsMax) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, PersonsBoatsFlagsMax.fields.personId)
-		val programId = new IntFieldValue(self, PersonsBoatsFlagsMax.fields.programId)
-		val boatId = new NullableIntFieldValue(self, PersonsBoatsFlagsMax.fields.boatId)
-		val maxFlag = new NullableStringFieldValue(self, PersonsBoatsFlagsMax.fields.maxFlag)
-	}
-}
-
-object PersonsBoatsFlagsMax extends StorableObject[PersonsBoatsFlagsMax] {
-	val entityName: String = "PERSONS_BOATS_FLAGS_MAX"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new NullableIntDatabaseField(self, "BOAT_ID")
-		val maxFlag = new NullableStringDatabaseField(self, "MAX_FLAG", 1)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsCard.scala b/entity-templates/PersonsCard.scala
deleted file mode 100644
index 3ec2c83f..00000000
--- a/entity-templates/PersonsCard.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsCard extends StorableClass(PersonsCard) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsCard.fields.assignId)
-		val personId = new NullableIntFieldValue(self, PersonsCard.fields.personId)
-		val issueDate = new NullableLocalDateTimeFieldValue(self, PersonsCard.fields.issueDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsCard.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsCard.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsCard.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsCard.fields.updatedBy)
-		val cardNum = new NullableStringFieldValue(self, PersonsCard.fields.cardNum)
-		val temp = new BooleanFIeldValue(self, PersonsCard.fields.temp)
-		val active = new NullableBooleanFIeldValue(self, PersonsCard.fields.active)
-		val price = new NullableDoubleFieldValue(self, PersonsCard.fields.price)
-		val paymentMedium = new NullableStringFieldValue(self, PersonsCard.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, PersonsCard.fields.ccTransNum)
-		val paid = new NullableBooleanFIeldValue(self, PersonsCard.fields.paid)
-		val closeId = new NullableIntFieldValue(self, PersonsCard.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, PersonsCard.fields.voidCloseId)
-		val nonce = new NullableStringFieldValue(self, PersonsCard.fields.nonce)
-	}
-}
-
-object PersonsCard extends StorableObject[PersonsCard] {
-	val entityName: String = "PERSONS_CARDS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val issueDate = new NullableLocalDateTimeDatabaseField(self, "ISSUE_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val temp = new BooleanDatabaseField(self, "TEMP")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 100)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val paid = new NullableBooleanDatabaseField(self, "PAID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val nonce = new NullableStringDatabaseField(self, "NONCE", 10)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsCardsAlternate.scala b/entity-templates/PersonsCardsAlternate.scala
deleted file mode 100644
index ef50ad17..00000000
--- a/entity-templates/PersonsCardsAlternate.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsCardsAlternate extends StorableClass(PersonsCardsAlternate) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsCardsAlternate.fields.assignId)
-		val personId = new NullableIntFieldValue(self, PersonsCardsAlternate.fields.personId)
-		val issueDate = new NullableLocalDateTimeFieldValue(self, PersonsCardsAlternate.fields.issueDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsCardsAlternate.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsCardsAlternate.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsCardsAlternate.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsCardsAlternate.fields.updatedBy)
-		val cardNum = new NullableStringFieldValue(self, PersonsCardsAlternate.fields.cardNum)
-		val temp = new BooleanFIeldValue(self, PersonsCardsAlternate.fields.temp)
-		val active = new NullableBooleanFIeldValue(self, PersonsCardsAlternate.fields.active)
-		val price = new NullableDoubleFieldValue(self, PersonsCardsAlternate.fields.price)
-		val paymentMedium = new NullableStringFieldValue(self, PersonsCardsAlternate.fields.paymentMedium)
-		val ccTransNum = new NullableDoubleFieldValue(self, PersonsCardsAlternate.fields.ccTransNum)
-		val paid = new NullableBooleanFIeldValue(self, PersonsCardsAlternate.fields.paid)
-		val closeId = new NullableIntFieldValue(self, PersonsCardsAlternate.fields.closeId)
-		val voidCloseId = new NullableIntFieldValue(self, PersonsCardsAlternate.fields.voidCloseId)
-		val nonce = new NullableStringFieldValue(self, PersonsCardsAlternate.fields.nonce)
-	}
-}
-
-object PersonsCardsAlternate extends StorableObject[PersonsCardsAlternate] {
-	val entityName: String = "PERSONS_CARDS_ALTERNATE"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val issueDate = new NullableLocalDateTimeDatabaseField(self, "ISSUE_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val temp = new BooleanDatabaseField(self, "TEMP")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 100)
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val paid = new NullableBooleanDatabaseField(self, "PAID")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val nonce = new NullableStringDatabaseField(self, "NONCE", 10)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsDiscountsEligible.scala b/entity-templates/PersonsDiscountsEligible.scala
deleted file mode 100644
index e3bce899..00000000
--- a/entity-templates/PersonsDiscountsEligible.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsDiscountsEligible extends StorableClass(PersonsDiscountsEligible) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, PersonsDiscountsEligible.fields.rowId)
-		val personId = new NullableIntFieldValue(self, PersonsDiscountsEligible.fields.personId)
-		val discountId = new NullableIntFieldValue(self, PersonsDiscountsEligible.fields.discountId)
-		val season = new NullableDoubleFieldValue(self, PersonsDiscountsEligible.fields.season)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsDiscountsEligible.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsDiscountsEligible.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsDiscountsEligible.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsDiscountsEligible.fields.updatedBy)
-	}
-}
-
-object PersonsDiscountsEligible extends StorableObject[PersonsDiscountsEligible] {
-	val entityName: String = "PERSONS_DISCOUNTS_ELIGIBLE"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val discountId = new NullableIntDatabaseField(self, "DISCOUNT_ID")
-		val season = new NullableDoubleDatabaseField(self, "SEASON")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsEvent.scala b/entity-templates/PersonsEvent.scala
deleted file mode 100644
index 8a0ed7e8..00000000
--- a/entity-templates/PersonsEvent.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsEvent extends StorableClass(PersonsEvent) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsEvent.fields.assignId)
-		val personId = new NullableIntFieldValue(self, PersonsEvent.fields.personId)
-		val eventId = new NullableIntFieldValue(self, PersonsEvent.fields.eventId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsEvent.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsEvent.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsEvent.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsEvent.fields.updatedBy)
-	}
-}
-
-object PersonsEvent extends StorableObject[PersonsEvent] {
-	val entityName: String = "PERSONS_EVENTS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val eventId = new NullableIntDatabaseField(self, "EVENT_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsMembership.scala b/entity-templates/PersonsMembership.scala
deleted file mode 100644
index efe1ed1b..00000000
--- a/entity-templates/PersonsMembership.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsMembership extends StorableClass(PersonsMembership) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsMembership.fields.assignId)
-		val personId = new IntFieldValue(self, PersonsMembership.fields.personId)
-		val membershipTypeId = new IntFieldValue(self, PersonsMembership.fields.membershipTypeId)
-		val purchaseDate = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.purchaseDate)
-		val startDate = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.startDate)
-		val expirationDate = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.expirationDate)
-		val schoolId = new NullableIntFieldValue(self, PersonsMembership.fields.schoolId)
-		val orderId = new NullableIntFieldValue(self, PersonsMembership.fields.orderId)
-		val price = new DoubleFieldValue(self, PersonsMembership.fields.price)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsMembership.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsMembership.fields.updatedBy)
-		val temp = new BooleanFIeldValue(self, PersonsMembership.fields.temp)
-		val paymentLocation = new NullableStringFieldValue(self, PersonsMembership.fields.paymentLocation)
-		val paymentMedium = new NullableStringFieldValue(self, PersonsMembership.fields.paymentMedium)
-		val oldCardNum = new NullableStringFieldValue(self, PersonsMembership.fields.oldCardNum)
-		val oldCompReason = new NullableStringFieldValue(self, PersonsMembership.fields.oldCompReason)
-		val oldDmgWaiver = new NullableBooleanFIeldValue(self, PersonsMembership.fields.oldDmgWaiver)
-		val closeId = new NullableIntFieldValue(self, PersonsMembership.fields.closeId)
-		val ccTransNum = new NullableDoubleFieldValue(self, PersonsMembership.fields.ccTransNum)
-		val groupId = new NullableIntFieldValue(self, PersonsMembership.fields.groupId)
-		val discountInstanceId = new NullableIntFieldValue(self, PersonsMembership.fields.discountInstanceId)
-		val notes = new NullableStringFieldValue(self, PersonsMembership.fields.notes)
-		val discountId = new NullableIntFieldValue(self, PersonsMembership.fields.discountId)
-		val voidCloseId = new NullableIntFieldValue(self, PersonsMembership.fields.voidCloseId)
-		val discountAmt = new NullableDoubleFieldValue(self, PersonsMembership.fields.discountAmt)
-		val taxRate = new NullableDoubleFieldValue(self, PersonsMembership.fields.taxRate)
-		val pretaxPrice = new NullableDoubleFieldValue(self, PersonsMembership.fields.pretaxPrice)
-		val uapGroupId = new NullableIntFieldValue(self, PersonsMembership.fields.uapGroupId)
-		val ignoreDiscountFrozen = new NullableBooleanFIeldValue(self, PersonsMembership.fields.ignoreDiscountFrozen)
-		val covidDays = new NullableDoubleFieldValue(self, PersonsMembership.fields.covidDays)
-		val covidEmailSent = new NullableBooleanFIeldValue(self, PersonsMembership.fields.covidEmailSent)
-		val originalExpirationDate = new NullableLocalDateTimeFieldValue(self, PersonsMembership.fields.originalExpirationDate)
-	}
-}
-
-object PersonsMembership extends StorableObject[PersonsMembership] {
-	val entityName: String = "PERSONS_MEMBERSHIPS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val membershipTypeId = new IntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val purchaseDate = new NullableLocalDateTimeDatabaseField(self, "PURCHASE_DATE")
-		val startDate = new NullableLocalDateTimeDatabaseField(self, "START_DATE")
-		val expirationDate = new NullableLocalDateTimeDatabaseField(self, "EXPIRATION_DATE")
-		val schoolId = new NullableIntDatabaseField(self, "SCHOOL_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val price = new DoubleDatabaseField(self, "PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val temp = new BooleanDatabaseField(self, "TEMP")
-		val paymentLocation = new NullableStringDatabaseField(self, "PAYMENT_LOCATION", 50)
-		val paymentMedium = new NullableStringDatabaseField(self, "PAYMENT_MEDIUM", 50)
-		val oldCardNum = new NullableStringDatabaseField(self, "OLD_CARD_NUM", 100)
-		val oldCompReason = new NullableStringDatabaseField(self, "OLD_COMP_REASON", 500)
-		val oldDmgWaiver = new NullableBooleanDatabaseField(self, "OLD_DMG_WAIVER")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val ccTransNum = new NullableDoubleDatabaseField(self, "CC_TRANS_NUM")
-		val groupId = new NullableIntDatabaseField(self, "GROUP_ID")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val notes = new NullableStringDatabaseField(self, "NOTES", 4000)
-		val discountId = new NullableIntDatabaseField(self, "DISCOUNT_ID")
-		val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val taxRate = new NullableDoubleDatabaseField(self, "TAX_RATE")
-		val pretaxPrice = new NullableDoubleDatabaseField(self, "PRETAX_PRICE")
-		val uapGroupId = new NullableIntDatabaseField(self, "UAP_GROUP_ID")
-		val ignoreDiscountFrozen = new NullableBooleanDatabaseField(self, "IGNORE_DISCOUNT_FROZEN")
-		val covidDays = new NullableDoubleDatabaseField(self, "COVID_DAYS")
-		val covidEmailSent = new NullableBooleanDatabaseField(self, "COVID_EMAIL_SENT")
-		val originalExpirationDate = new NullableLocalDateTimeDatabaseField(self, "ORIGINAL_EXPIRATION_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsRating.scala b/entity-templates/PersonsRating.scala
deleted file mode 100644
index f119e9f7..00000000
--- a/entity-templates/PersonsRating.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsRating extends StorableClass(PersonsRating) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsRating.fields.assignId)
-		val personId = new IntFieldValue(self, PersonsRating.fields.personId)
-		val ratingId = new IntFieldValue(self, PersonsRating.fields.ratingId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsRating.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsRating.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsRating.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsRating.fields.updatedBy)
-		val programId = new IntFieldValue(self, PersonsRating.fields.programId)
-		val testSignoutId = new NullableIntFieldValue(self, PersonsRating.fields.testSignoutId)
-	}
-}
-
-object PersonsRating extends StorableObject[PersonsRating] {
-	val entityName: String = "PERSONS_RATINGS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val ratingId = new IntDatabaseField(self, "RATING_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val testSignoutId = new NullableIntDatabaseField(self, "TEST_SIGNOUT_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsRecurringDonation.scala b/entity-templates/PersonsRecurringDonation.scala
deleted file mode 100644
index a80a9e08..00000000
--- a/entity-templates/PersonsRecurringDonation.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsRecurringDonation extends StorableClass(PersonsRecurringDonation) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, PersonsRecurringDonation.fields.rowId)
-		val personId = new IntFieldValue(self, PersonsRecurringDonation.fields.personId)
-		val fundId = new IntFieldValue(self, PersonsRecurringDonation.fields.fundId)
-		val amountInCents = new DoubleFieldValue(self, PersonsRecurringDonation.fields.amountInCents)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsRecurringDonation.fields.createdOn)
-		val embryonic = new NullableBooleanFIeldValue(self, PersonsRecurringDonation.fields.embryonic)
-	}
-}
-
-object PersonsRecurringDonation extends StorableObject[PersonsRecurringDonation] {
-	val entityName: String = "PERSONS_RECURRING_DONATIONS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val fundId = new IntDatabaseField(self, "FUND_ID")
-		val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val embryonic = new NullableBooleanDatabaseField(self, "EMBRYONIC")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsTag.scala b/entity-templates/PersonsTag.scala
deleted file mode 100644
index eb8763d2..00000000
--- a/entity-templates/PersonsTag.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsTag extends StorableClass(PersonsTag) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, PersonsTag.fields.assignId)
-		val personId = new NullableIntFieldValue(self, PersonsTag.fields.personId)
-		val tagId = new NullableIntFieldValue(self, PersonsTag.fields.tagId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsTag.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsTag.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsTag.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsTag.fields.updatedBy)
-	}
-}
-
-object PersonsTag extends StorableObject[PersonsTag] {
-	val entityName: String = "PERSONS_TAGS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val tagId = new NullableIntDatabaseField(self, "TAG_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsTemp.scala b/entity-templates/PersonsTemp.scala
deleted file mode 100644
index 695bc094..00000000
--- a/entity-templates/PersonsTemp.scala
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsTemp extends StorableClass(PersonsTemp) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, PersonsTemp.fields.personId)
-		val nameFirst = new NullableStringFieldValue(self, PersonsTemp.fields.nameFirst)
-		val nameMiddleInitial = new NullableStringFieldValue(self, PersonsTemp.fields.nameMiddleInitial)
-		val nameLast = new NullableStringFieldValue(self, PersonsTemp.fields.nameLast)
-		val namePrefix = new NullableStringFieldValue(self, PersonsTemp.fields.namePrefix)
-		val nameSuffix = new NullableStringFieldValue(self, PersonsTemp.fields.nameSuffix)
-		val gender = new NullableBooleanFIeldValue(self, PersonsTemp.fields.gender)
-		val dob = new NullableLocalDateTimeFieldValue(self, PersonsTemp.fields.dob)
-		val email = new NullableStringFieldValue(self, PersonsTemp.fields.email)
-		val parentEmail = new NullableStringFieldValue(self, PersonsTemp.fields.parentEmail)
-		val addr1 = new NullableStringFieldValue(self, PersonsTemp.fields.addr1)
-		val addr2 = new NullableStringFieldValue(self, PersonsTemp.fields.addr2)
-		val addr3 = new NullableStringFieldValue(self, PersonsTemp.fields.addr3)
-		val city = new NullableStringFieldValue(self, PersonsTemp.fields.city)
-		val state = new NullableStringFieldValue(self, PersonsTemp.fields.state)
-		val zip = new NullableStringFieldValue(self, PersonsTemp.fields.zip)
-		val country = new NullableStringFieldValue(self, PersonsTemp.fields.country)
-		val phonePrimary = new NullableStringFieldValue(self, PersonsTemp.fields.phonePrimary)
-		val phonePrimaryType = new NullableStringFieldValue(self, PersonsTemp.fields.phonePrimaryType)
-		val phoneAlternate = new NullableStringFieldValue(self, PersonsTemp.fields.phoneAlternate)
-		val phoneAlternateType = new NullableStringFieldValue(self, PersonsTemp.fields.phoneAlternateType)
-		val emerg1Name = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1Name)
-		val emerg1Relation = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1Relation)
-		val emerg1PhonePrimary = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1PhonePrimary)
-		val emerg1PhoneAlternate = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1PhoneAlternate)
-		val emerg2Name = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2Name)
-		val emerg2Relation = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2Relation)
-		val emerg2PhonePrimary = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2PhonePrimary)
-		val emerg2PhoneAlternate = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2PhoneAlternate)
-		val allergies = new NullableStringFieldValue(self, PersonsTemp.fields.allergies)
-		val medications = new NullableStringFieldValue(self, PersonsTemp.fields.medications)
-		val specialNeeds = new NullableStringFieldValue(self, PersonsTemp.fields.specialNeeds)
-		val badMail = new NullableBooleanFIeldValue(self, PersonsTemp.fields.badMail)
-		val deceased = new NullableBooleanFIeldValue(self, PersonsTemp.fields.deceased)
-		val doNotCall = new NullableBooleanFIeldValue(self, PersonsTemp.fields.doNotCall)
-		val doNotEmail = new NullableBooleanFIeldValue(self, PersonsTemp.fields.doNotEmail)
-		val doNotMail = new NullableBooleanFIeldValue(self, PersonsTemp.fields.doNotMail)
-		val occupation = new NullableStringFieldValue(self, PersonsTemp.fields.occupation)
-		val employer = new NullableStringFieldValue(self, PersonsTemp.fields.employer)
-		val matchingGifts = new NullableBooleanFIeldValue(self, PersonsTemp.fields.matchingGifts)
-		val citizenship = new NullableStringFieldValue(self, PersonsTemp.fields.citizenship)
-		val ethnicity = new NullableStringFieldValue(self, PersonsTemp.fields.ethnicity)
-		val language = new NullableStringFieldValue(self, PersonsTemp.fields.language)
-		val referralSource = new NullableStringFieldValue(self, PersonsTemp.fields.referralSource)
-		val sailingExp = new NullableStringFieldValue(self, PersonsTemp.fields.sailingExp)
-		val organization = new NullableStringFieldValue(self, PersonsTemp.fields.organization)
-		val orgContact = new NullableStringFieldValue(self, PersonsTemp.fields.orgContact)
-		val student = new NullableBooleanFIeldValue(self, PersonsTemp.fields.student)
-		val school = new NullableStringFieldValue(self, PersonsTemp.fields.school)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, PersonsTemp.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, PersonsTemp.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, PersonsTemp.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, PersonsTemp.fields.updatedBy)
-		val ethnicityOther = new NullableStringFieldValue(self, PersonsTemp.fields.ethnicityOther)
-		val referralOther = new NullableStringFieldValue(self, PersonsTemp.fields.referralOther)
-		val allowSignouts = new NullableBooleanFIeldValue(self, PersonsTemp.fields.allowSignouts)
-		val sendAlert = new NullableBooleanFIeldValue(self, PersonsTemp.fields.sendAlert)
-		val temp = new BooleanFIeldValue(self, PersonsTemp.fields.temp)
-		val personType = new NullableDoubleFieldValue(self, PersonsTemp.fields.personType)
-		val emerg1PhonePrimaryType = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1PhonePrimaryType)
-		val emerg1PhoneAlternateType = new NullableStringFieldValue(self, PersonsTemp.fields.emerg1PhoneAlternateType)
-		val emerg2PhonePrimaryType = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2PhonePrimaryType)
-		val emerg2PhoneAlternateType = new NullableStringFieldValue(self, PersonsTemp.fields.emerg2PhoneAlternateType)
-		val badPhone = new NullableBooleanFIeldValue(self, PersonsTemp.fields.badPhone)
-		val badEmail = new NullableBooleanFIeldValue(self, PersonsTemp.fields.badEmail)
-		val military = new NullableStringFieldValue(self, PersonsTemp.fields.military)
-		val reducedLunch = new NullableBooleanFIeldValue(self, PersonsTemp.fields.reducedLunch)
-		val pwHash = new NullableStringFieldValue(self, PersonsTemp.fields.pwHash)
-		val incomeLevel = new NullableDoubleFieldValue(self, PersonsTemp.fields.incomeLevel)
-		val newReturning = new NullableBooleanFIeldValue(self, PersonsTemp.fields.newReturning)
-		val swimProof = new NullableDoubleFieldValue(self, PersonsTemp.fields.swimProof)
-		val oldFundraisingGreeting = new NullableStringFieldValue(self, PersonsTemp.fields.oldFundraisingGreeting)
-		val oldPhoneWork = new NullableStringFieldValue(self, PersonsTemp.fields.oldPhoneWork)
-		val languageOther = new NullableStringFieldValue(self, PersonsTemp.fields.languageOther)
-	}
-}
-
-object PersonsTemp extends StorableObject[PersonsTemp] {
-	val entityName: String = "PERSONS_TEMP"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameMiddleInitial = new NullableStringDatabaseField(self, "NAME_MIDDLE_INITIAL", 5)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val namePrefix = new NullableStringDatabaseField(self, "NAME_PREFIX", 50)
-		val nameSuffix = new NullableStringDatabaseField(self, "NAME_SUFFIX", 50)
-		val gender = new NullableBooleanDatabaseField(self, "GENDER")
-		val dob = new NullableLocalDateTimeDatabaseField(self, "DOB")
-		val email = new NullableStringDatabaseField(self, "EMAIL", 100)
-		val parentEmail = new NullableStringDatabaseField(self, "PARENT_EMAIL", 100)
-		val addr1 = new NullableStringDatabaseField(self, "ADDR_1", 200)
-		val addr2 = new NullableStringDatabaseField(self, "ADDR_2", 200)
-		val addr3 = new NullableStringDatabaseField(self, "ADDR_3", 200)
-		val city = new NullableStringDatabaseField(self, "CITY", 50)
-		val state = new NullableStringDatabaseField(self, "STATE", 50)
-		val zip = new NullableStringDatabaseField(self, "ZIP", 15)
-		val country = new NullableStringDatabaseField(self, "COUNTRY", 50)
-		val phonePrimary = new NullableStringDatabaseField(self, "PHONE_PRIMARY", 100)
-		val phonePrimaryType = new NullableStringDatabaseField(self, "PHONE_PRIMARY_TYPE", 50)
-		val phoneAlternate = new NullableStringDatabaseField(self, "PHONE_ALTERNATE", 30)
-		val phoneAlternateType = new NullableStringDatabaseField(self, "PHONE_ALTERNATE_TYPE", 50)
-		val emerg1Name = new NullableStringDatabaseField(self, "EMERG1_NAME", 200)
-		val emerg1Relation = new NullableStringDatabaseField(self, "EMERG1_RELATION", 50)
-		val emerg1PhonePrimary = new NullableStringDatabaseField(self, "EMERG1_PHONE_PRIMARY", 100)
-		val emerg1PhoneAlternate = new NullableStringDatabaseField(self, "EMERG1_PHONE_ALTERNATE", 100)
-		val emerg2Name = new NullableStringDatabaseField(self, "EMERG2_NAME", 200)
-		val emerg2Relation = new NullableStringDatabaseField(self, "EMERG2_RELATION", 50)
-		val emerg2PhonePrimary = new NullableStringDatabaseField(self, "EMERG2_PHONE_PRIMARY", 100)
-		val emerg2PhoneAlternate = new NullableStringDatabaseField(self, "EMERG2_PHONE_ALTERNATE", 100)
-		val allergies = new NullableStringDatabaseField(self, "ALLERGIES", 4000)
-		val medications = new NullableStringDatabaseField(self, "MEDICATIONS", 4000)
-		val specialNeeds = new NullableStringDatabaseField(self, "SPECIAL_NEEDS", 4000)
-		val badMail = new NullableBooleanDatabaseField(self, "BAD_MAIL")
-		val deceased = new NullableBooleanDatabaseField(self, "DECEASED")
-		val doNotCall = new NullableBooleanDatabaseField(self, "DO_NOT_CALL")
-		val doNotEmail = new NullableBooleanDatabaseField(self, "DO_NOT_EMAIL")
-		val doNotMail = new NullableBooleanDatabaseField(self, "DO_NOT_MAIL")
-		val occupation = new NullableStringDatabaseField(self, "OCCUPATION", 100)
-		val employer = new NullableStringDatabaseField(self, "EMPLOYER", 100)
-		val matchingGifts = new NullableBooleanDatabaseField(self, "MATCHING_GIFTS")
-		val citizenship = new NullableStringDatabaseField(self, "CITIZENSHIP", 100)
-		val ethnicity = new NullableStringDatabaseField(self, "ETHNICITY", 100)
-		val language = new NullableStringDatabaseField(self, "LANGUAGE", 100)
-		val referralSource = new NullableStringDatabaseField(self, "REFERRAL_SOURCE", 200)
-		val sailingExp = new NullableStringDatabaseField(self, "SAILING_EXP", 100)
-		val organization = new NullableStringDatabaseField(self, "ORGANIZATION", 100)
-		val orgContact = new NullableStringDatabaseField(self, "ORG_CONTACT", 200)
-		val student = new NullableBooleanDatabaseField(self, "STUDENT")
-		val school = new NullableStringDatabaseField(self, "SCHOOL", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val ethnicityOther = new NullableStringDatabaseField(self, "ETHNICITY_OTHER", 100)
-		val referralOther = new NullableStringDatabaseField(self, "REFERRAL_OTHER", 100)
-		val allowSignouts = new NullableBooleanDatabaseField(self, "ALLOW_SIGNOUTS")
-		val sendAlert = new NullableBooleanDatabaseField(self, "SEND_ALERT")
-		val temp = new BooleanDatabaseField(self, "TEMP")
-		val personType = new NullableDoubleDatabaseField(self, "PERSON_TYPE")
-		val emerg1PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG1_PHONE_PRIMARY_TYPE", 50)
-		val emerg1PhoneAlternateType = new NullableStringDatabaseField(self, "EMERG1_PHONE_ALTERNATE_TYPE", 50)
-		val emerg2PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG2_PHONE_PRIMARY_TYPE", 50)
-		val emerg2PhoneAlternateType = new NullableStringDatabaseField(self, "EMERG2_PHONE_ALTERNATE_TYPE", 50)
-		val badPhone = new NullableBooleanDatabaseField(self, "BAD_PHONE")
-		val badEmail = new NullableBooleanDatabaseField(self, "BAD_EMAIL")
-		val military = new NullableStringDatabaseField(self, "MILITARY", 50)
-		val reducedLunch = new NullableBooleanDatabaseField(self, "REDUCED_LUNCH")
-		val pwHash = new NullableStringDatabaseField(self, "PW_HASH", 100)
-		val incomeLevel = new NullableDoubleDatabaseField(self, "INCOME_LEVEL")
-		val newReturning = new NullableBooleanDatabaseField(self, "NEW_RETURNING")
-		val swimProof = new NullableDoubleDatabaseField(self, "SWIM_PROOF")
-		val oldFundraisingGreeting = new NullableStringDatabaseField(self, "OLD_FUNDRAISING_GREETING", 300)
-		val oldPhoneWork = new NullableStringDatabaseField(self, "OLD_PHONE_WORK", 50)
-		val languageOther = new NullableStringDatabaseField(self, "LANGUAGE_OTHER", 200)
-	}
-
-	def primaryKey: IntDatabaseField = fields.personId
-}
\ No newline at end of file
diff --git a/entity-templates/PersonsToDelete.scala b/entity-templates/PersonsToDelete.scala
deleted file mode 100644
index 1cd4fa40..00000000
--- a/entity-templates/PersonsToDelete.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class PersonsToDelete extends StorableClass(PersonsToDelete) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, PersonsToDelete.fields.rowId)
-		val personId = new NullableIntFieldValue(self, PersonsToDelete.fields.personId)
-		val mergedInto = new NullableDoubleFieldValue(self, PersonsToDelete.fields.mergedInto)
-	}
-}
-
-object PersonsToDelete extends StorableObject[PersonsToDelete] {
-	val entityName: String = "PERSONS_TO_DELETE"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val mergedInto = new NullableDoubleDatabaseField(self, "MERGED_INTO")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/Preference.scala b/entity-templates/Preference.scala
deleted file mode 100644
index 28a0c7fc..00000000
--- a/entity-templates/Preference.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Preference extends StorableClass(Preference) {
-	object values extends ValuesObject {
-		val prefId = new IntFieldValue(self, Preference.fields.prefId)
-		val dataType = new NullableDoubleFieldValue(self, Preference.fields.dataType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Preference.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Preference.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Preference.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Preference.fields.updatedBy)
-		val prefAlias = new StringFieldValue(self, Preference.fields.prefAlias)
-		val prefDescription = new NullableStringFieldValue(self, Preference.fields.prefDescription)
-	}
-}
-
-object Preference extends StorableObject[Preference] {
-	val entityName: String = "PREFERENCES"
-
-	object fields extends FieldsObject {
-		val prefId = new IntDatabaseField(self, "PREF_ID")
-		val dataType = new NullableDoubleDatabaseField(self, "DATA_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val prefAlias = new StringDatabaseField(self, "PREF_ALIAS", 50)
-		val prefDescription = new NullableStringDatabaseField(self, "PREF_DESCRIPTION", 1000)
-	}
-
-	def primaryKey: IntDatabaseField = fields.prefId
-}
\ No newline at end of file
diff --git a/entity-templates/ProgramType.scala b/entity-templates/ProgramType.scala
deleted file mode 100644
index 62a1e888..00000000
--- a/entity-templates/ProgramType.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ProgramType extends StorableClass(ProgramType) {
-	object values extends ValuesObject {
-		val programId = new IntFieldValue(self, ProgramType.fields.programId)
-		val programName = new StringFieldValue(self, ProgramType.fields.programName)
-		val displayOrder = new NullableDoubleFieldValue(self, ProgramType.fields.displayOrder)
-		val active = new NullableBooleanFIeldValue(self, ProgramType.fields.active)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ProgramType.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ProgramType.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ProgramType.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ProgramType.fields.updatedBy)
-		val colorDisplay = new NullableStringFieldValue(self, ProgramType.fields.colorDisplay)
-	}
-}
-
-object ProgramType extends StorableObject[ProgramType] {
-	val entityName: String = "PROGRAM_TYPES"
-
-	object fields extends FieldsObject {
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val programName = new StringDatabaseField(self, "PROGRAM_NAME", 100)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val colorDisplay = new NullableStringDatabaseField(self, "COLOR_DISPLAY", 4000)
-	}
-
-	def primaryKey: IntDatabaseField = fields.programId
-}
\ No newline at end of file
diff --git a/entity-templates/Promotion.scala b/entity-templates/Promotion.scala
deleted file mode 100644
index 427fc7cd..00000000
--- a/entity-templates/Promotion.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Promotion extends StorableClass(Promotion) {
-	object values extends ValuesObject {
-		val promoId = new IntFieldValue(self, Promotion.fields.promoId)
-		val promoType = new NullableBooleanFIeldValue(self, Promotion.fields.promoType)
-		val promoAmount = new NullableDoubleFieldValue(self, Promotion.fields.promoAmount)
-		val redemptionCode = new NullableStringFieldValue(self, Promotion.fields.redemptionCode)
-		val startDate = new NullableLocalDateTimeFieldValue(self, Promotion.fields.startDate)
-		val endDate = new NullableLocalDateTimeFieldValue(self, Promotion.fields.endDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Promotion.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Promotion.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Promotion.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Promotion.fields.updatedBy)
-	}
-}
-
-object Promotion extends StorableObject[Promotion] {
-	val entityName: String = "PROMOTIONS"
-
-	object fields extends FieldsObject {
-		val promoId = new IntDatabaseField(self, "PROMO_ID")
-		val promoType = new NullableBooleanDatabaseField(self, "PROMO_TYPE")
-		val promoAmount = new NullableDoubleDatabaseField(self, "PROMO_AMOUNT")
-		val redemptionCode = new NullableStringDatabaseField(self, "REDEMPTION_CODE", 100)
-		val startDate = new NullableLocalDateTimeDatabaseField(self, "START_DATE")
-		val endDate = new NullableLocalDateTimeDatabaseField(self, "END_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.promoId
-}
\ No newline at end of file
diff --git a/entity-templates/RaCz.scala b/entity-templates/RaCz.scala
deleted file mode 100644
index 488fc9b8..00000000
--- a/entity-templates/RaCz.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class RaCz extends StorableClass(RaCz) {
-	object values extends ValuesObject {
-		val eventId = new IntFieldValue(self, RaCz.fields.eventId)
-		val signoutId = new IntFieldValue(self, RaCz.fields.signoutId)
-		val eventDatetime = new NullableLocalDateTimeFieldValue(self, RaCz.fields.eventDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, RaCz.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, RaCz.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, RaCz.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, RaCz.fields.updatedBy)
-		val raCz = new NullableBooleanFIeldValue(self, RaCz.fields.raCz)
-	}
-}
-
-object RaCz extends StorableObject[RaCz] {
-	val entityName: String = "RA_CZ"
-
-	object fields extends FieldsObject {
-		val eventId = new IntDatabaseField(self, "EVENT_ID")
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-		val eventDatetime = new NullableLocalDateTimeDatabaseField(self, "EVENT_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val raCz = new NullableBooleanDatabaseField(self, "RA_CZ")
-	}
-
-	def primaryKey: IntDatabaseField = fields.eventId
-}
\ No newline at end of file
diff --git a/entity-templates/Rating.scala b/entity-templates/Rating.scala
deleted file mode 100644
index bde36437..00000000
--- a/entity-templates/Rating.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Rating extends StorableClass(Rating) {
-	object values extends ValuesObject {
-		val ratingId = new IntFieldValue(self, Rating.fields.ratingId)
-		val ratingName = new NullableStringFieldValue(self, Rating.fields.ratingName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Rating.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Rating.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Rating.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Rating.fields.updatedBy)
-		val displayOrder = new NullableDoubleFieldValue(self, Rating.fields.displayOrder)
-		val active = new NullableBooleanFIeldValue(self, Rating.fields.active)
-		val overriddenBy = new NullableDoubleFieldValue(self, Rating.fields.overriddenBy)
-		val testMinCrew = new NullableDoubleFieldValue(self, Rating.fields.testMinCrew)
-		val testMaxCrew = new NullableDoubleFieldValue(self, Rating.fields.testMaxCrew)
-		val testable = new NullableBooleanFIeldValue(self, Rating.fields.testable)
-	}
-}
-
-object Rating extends StorableObject[Rating] {
-	val entityName: String = "RATINGS"
-
-	object fields extends FieldsObject {
-		val ratingId = new IntDatabaseField(self, "RATING_ID")
-		val ratingName = new NullableStringDatabaseField(self, "RATING_NAME", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val overriddenBy = new NullableDoubleDatabaseField(self, "OVERRIDDEN_BY")
-		val testMinCrew = new NullableDoubleDatabaseField(self, "TEST_MIN_CREW")
-		val testMaxCrew = new NullableDoubleDatabaseField(self, "TEST_MAX_CREW")
-		val testable = new NullableBooleanDatabaseField(self, "TESTABLE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.ratingId
-}
\ No newline at end of file
diff --git a/entity-templates/RatingChange.scala b/entity-templates/RatingChange.scala
deleted file mode 100644
index ff126481..00000000
--- a/entity-templates/RatingChange.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class RatingChange extends StorableClass(RatingChange) {
-	object values extends ValuesObject {
-		val changeId = new IntFieldValue(self, RatingChange.fields.changeId)
-		val personId = new IntFieldValue(self, RatingChange.fields.personId)
-		val ratingId = new IntFieldValue(self, RatingChange.fields.ratingId)
-		val programId = new IntFieldValue(self, RatingChange.fields.programId)
-		val action = new NullableBooleanFIeldValue(self, RatingChange.fields.action)
-		val changedBy = new NullableStringFieldValue(self, RatingChange.fields.changedBy)
-		val changedDate = new NullableLocalDateTimeFieldValue(self, RatingChange.fields.changedDate)
-		val comments = new NullableStringFieldValue(self, RatingChange.fields.comments)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, RatingChange.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, RatingChange.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, RatingChange.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, RatingChange.fields.updatedBy)
-	}
-}
-
-object RatingChange extends StorableObject[RatingChange] {
-	val entityName: String = "RATING_CHANGES"
-
-	object fields extends FieldsObject {
-		val changeId = new IntDatabaseField(self, "CHANGE_ID")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val ratingId = new IntDatabaseField(self, "RATING_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val action = new NullableBooleanDatabaseField(self, "ACTION")
-		val changedBy = new NullableStringDatabaseField(self, "CHANGED_BY", 50)
-		val changedDate = new NullableLocalDateTimeDatabaseField(self, "CHANGED_DATE")
-		val comments = new NullableStringDatabaseField(self, "COMMENTS", 4000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.changeId
-}
\ No newline at end of file
diff --git a/entity-templates/RatingsProgram.scala b/entity-templates/RatingsProgram.scala
deleted file mode 100644
index 4479e9e8..00000000
--- a/entity-templates/RatingsProgram.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class RatingsProgram extends StorableClass(RatingsProgram) {
-	object values extends ValuesObject {
-		val assignId = new IntFieldValue(self, RatingsProgram.fields.assignId)
-		val ratingId = new NullableIntFieldValue(self, RatingsProgram.fields.ratingId)
-		val programId = new NullableIntFieldValue(self, RatingsProgram.fields.programId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, RatingsProgram.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, RatingsProgram.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, RatingsProgram.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, RatingsProgram.fields.updatedBy)
-	}
-}
-
-object RatingsProgram extends StorableObject[RatingsProgram] {
-	val entityName: String = "RATINGS_PROGRAMS"
-
-	object fields extends FieldsObject {
-		val assignId = new IntDatabaseField(self, "ASSIGN_ID")
-		val ratingId = new NullableIntDatabaseField(self, "RATING_ID")
-		val programId = new NullableIntDatabaseField(self, "PROGRAM_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.assignId
-}
\ No newline at end of file
diff --git a/entity-templates/ResetPwReq.scala b/entity-templates/ResetPwReq.scala
deleted file mode 100644
index 8e324cb5..00000000
--- a/entity-templates/ResetPwReq.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ResetPwReq extends StorableClass(ResetPwReq) {
-	object values extends ValuesObject {
-		val reqId = new IntFieldValue(self, ResetPwReq.fields.reqId)
-		val personUser = new BooleanFIeldValue(self, ResetPwReq.fields.personUser)
-		val reqHash = new StringFieldValue(self, ResetPwReq.fields.reqHash)
-		val used = new NullableBooleanFIeldValue(self, ResetPwReq.fields.used)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ResetPwReq.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ResetPwReq.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ResetPwReq.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ResetPwReq.fields.updatedBy)
-		val email = new NullableStringFieldValue(self, ResetPwReq.fields.email)
-	}
-}
-
-object ResetPwReq extends StorableObject[ResetPwReq] {
-	val entityName: String = "RESET_PW_REQS"
-
-	object fields extends FieldsObject {
-		val reqId = new IntDatabaseField(self, "REQ_ID")
-		val personUser = new BooleanDatabaseField(self, "PERSON_USER")
-		val reqHash = new StringDatabaseField(self, "REQ_HASH", 50)
-		val used = new NullableBooleanDatabaseField(self, "USED")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val email = new NullableStringDatabaseField(self, "EMAIL", 200)
-	}
-
-	def primaryKey: IntDatabaseField = fields.reqId
-}
\ No newline at end of file
diff --git a/entity-templates/Restriction.scala b/entity-templates/Restriction.scala
deleted file mode 100644
index 7f51416a..00000000
--- a/entity-templates/Restriction.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Restriction extends StorableClass(Restriction) {
-	object values extends ValuesObject {
-		val restrictionId = new IntFieldValue(self, Restriction.fields.restrictionId)
-		val restrictionText = new NullableStringFieldValue(self, Restriction.fields.restrictionText)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Restriction.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Restriction.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Restriction.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Restriction.fields.updatedBy)
-	}
-}
-
-object Restriction extends StorableObject[Restriction] {
-	val entityName: String = "RESTRICTIONS"
-
-	object fields extends FieldsObject {
-		val restrictionId = new IntDatabaseField(self, "RESTRICTION_ID")
-		val restrictionText = new NullableStringDatabaseField(self, "RESTRICTION_TEXT", 1000)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.restrictionId
-}
\ No newline at end of file
diff --git a/entity-templates/ScheduledDowntime.scala b/entity-templates/ScheduledDowntime.scala
deleted file mode 100644
index 5ec56c3e..00000000
--- a/entity-templates/ScheduledDowntime.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ScheduledDowntime extends StorableClass(ScheduledDowntime) {
-	object values extends ValuesObject {
-		val scheduleId = new IntFieldValue(self, ScheduledDowntime.fields.scheduleId)
-		val startDatetime = new NullableLocalDateTimeFieldValue(self, ScheduledDowntime.fields.startDatetime)
-		val endDatetime = new NullableLocalDateTimeFieldValue(self, ScheduledDowntime.fields.endDatetime)
-	}
-}
-
-object ScheduledDowntime extends StorableObject[ScheduledDowntime] {
-	val entityName: String = "SCHEDULED_DOWNTIME"
-
-	object fields extends FieldsObject {
-		val scheduleId = new IntDatabaseField(self, "SCHEDULE_ID")
-		val startDatetime = new NullableLocalDateTimeDatabaseField(self, "START_DATETIME")
-		val endDatetime = new NullableLocalDateTimeDatabaseField(self, "END_DATETIME")
-	}
-
-	def primaryKey: IntDatabaseField = fields.scheduleId
-}
\ No newline at end of file
diff --git a/entity-templates/SendgridSuppressionActivity.scala b/entity-templates/SendgridSuppressionActivity.scala
deleted file mode 100644
index a1684963..00000000
--- a/entity-templates/SendgridSuppressionActivity.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SendgridSuppressionActivity extends StorableClass(SendgridSuppressionActivity) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, SendgridSuppressionActivity.fields.rowId)
-		val occurredDatetime = new NullableLocalDateTimeFieldValue(self, SendgridSuppressionActivity.fields.occurredDatetime)
-		val email = new NullableStringFieldValue(self, SendgridSuppressionActivity.fields.email)
-		val reason = new NullableStringFieldValue(self, SendgridSuppressionActivity.fields.reason)
-		val status = new NullableStringFieldValue(self, SendgridSuppressionActivity.fields.status)
-		val ip = new NullableStringFieldValue(self, SendgridSuppressionActivity.fields.ip)
-		val type = new NullableStringFieldValue(self, SendgridSuppressionActivity.fields.type)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SendgridSuppressionActivity.fields.createdOn)
-	}
-}
-
-object SendgridSuppressionActivity extends StorableObject[SendgridSuppressionActivity] {
-	val entityName: String = "SENDGRID_SUPPRESSION_ACTIVITY"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val occurredDatetime = new NullableLocalDateTimeDatabaseField(self, "OCCURRED_DATETIME")
-		val email = new NullableStringDatabaseField(self, "EMAIL", 500)
-		val reason = new NullableStringDatabaseField(self, "REASON", 4000)
-		val status = new NullableStringDatabaseField(self, "STATUS", 50)
-		val ip = new NullableStringDatabaseField(self, "IP", 30)
-		val type = new NullableStringDatabaseField(self, "TYPE", 15)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/SequenceInfo.scala b/entity-templates/SequenceInfo.scala
deleted file mode 100644
index e2598437..00000000
--- a/entity-templates/SequenceInfo.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SequenceInfo extends StorableClass(SequenceInfo) {
-	object values extends ValuesObject {
-		val sequenceName = new NullableStringFieldValue(self, SequenceInfo.fields.sequenceName)
-		val tableName = new StringFieldValue(self, SequenceInfo.fields.tableName)
-		val columnName = new NullableStringFieldValue(self, SequenceInfo.fields.columnName)
-		val position = new NullableDoubleFieldValue(self, SequenceInfo.fields.position)
-	}
-}
-
-object SequenceInfo extends StorableObject[SequenceInfo] {
-	val entityName: String = "SEQUENCE_INFO"
-
-	object fields extends FieldsObject {
-		val sequenceName = new NullableStringDatabaseField(self, "SEQUENCE_NAME", 128)
-		val tableName = new StringDatabaseField(self, "TABLE_NAME", 128)
-		val columnName = new NullableStringDatabaseField(self, "COLUMN_NAME", 4000)
-		val position = new NullableDoubleDatabaseField(self, "POSITION")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/SessionBlacklist.scala b/entity-templates/SessionBlacklist.scala
deleted file mode 100644
index 03dcfc59..00000000
--- a/entity-templates/SessionBlacklist.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SessionBlacklist extends StorableClass(SessionBlacklist) {
-	object values extends ValuesObject {
-		val blacklistId = new IntFieldValue(self, SessionBlacklist.fields.blacklistId)
-		val sessionId = new NullableStringFieldValue(self, SessionBlacklist.fields.sessionId)
-		val blacklistDatetime = new NullableLocalDateTimeFieldValue(self, SessionBlacklist.fields.blacklistDatetime)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SessionBlacklist.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SessionBlacklist.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SessionBlacklist.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SessionBlacklist.fields.updatedBy)
-	}
-}
-
-object SessionBlacklist extends StorableObject[SessionBlacklist] {
-	val entityName: String = "SESSION_BLACKLIST"
-
-	object fields extends FieldsObject {
-		val blacklistId = new IntDatabaseField(self, "BLACKLIST_ID")
-		val sessionId = new NullableStringDatabaseField(self, "SESSION_ID", 50)
-		val blacklistDatetime = new NullableLocalDateTimeDatabaseField(self, "BLACKLIST_DATETIME")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.blacklistId
-}
\ No newline at end of file
diff --git a/entity-templates/SessionKey.scala b/entity-templates/SessionKey.scala
deleted file mode 100644
index eda109b1..00000000
--- a/entity-templates/SessionKey.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SessionKey extends StorableClass(SessionKey) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, SessionKey.fields.rowId)
-		val apexSession = new NullableStringFieldValue(self, SessionKey.fields.apexSession)
-		val remoteKey = new NullableStringFieldValue(self, SessionKey.fields.remoteKey)
-		val username = new NullableStringFieldValue(self, SessionKey.fields.username)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SessionKey.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SessionKey.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SessionKey.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SessionKey.fields.updatedBy)
-	}
-}
-
-object SessionKey extends StorableObject[SessionKey] {
-	val entityName: String = "SESSION_KEYS"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val apexSession = new NullableStringDatabaseField(self, "APEX_SESSION", 100)
-		val remoteKey = new NullableStringDatabaseField(self, "REMOTE_KEY", 100)
-		val username = new NullableStringDatabaseField(self, "USERNAME", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartApplGc.scala b/entity-templates/ShoppingCartApplGc.scala
deleted file mode 100644
index c0ac2e1a..00000000
--- a/entity-templates/ShoppingCartApplGc.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartApplGc extends StorableClass(ShoppingCartApplGc) {
-	object values extends ValuesObject {
-		val certId = new IntFieldValue(self, ShoppingCartApplGc.fields.certId)
-		val orderId = new IntFieldValue(self, ShoppingCartApplGc.fields.orderId)
-		val amount = new NullableDoubleFieldValue(self, ShoppingCartApplGc.fields.amount)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartApplGc.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartApplGc.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartApplGc.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartApplGc.fields.updatedBy)
-		val remainingValue = new NullableDoubleFieldValue(self, ShoppingCartApplGc.fields.remainingValue)
-	}
-}
-
-object ShoppingCartApplGc extends StorableObject[ShoppingCartApplGc] {
-	val entityName: String = "SHOPPING_CART_APPL_GC"
-
-	object fields extends FieldsObject {
-		val certId = new IntDatabaseField(self, "CERT_ID")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val amount = new NullableDoubleDatabaseField(self, "AMOUNT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val remainingValue = new NullableDoubleDatabaseField(self, "REMAINING_VALUE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.certId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartDonation.scala b/entity-templates/ShoppingCartDonation.scala
deleted file mode 100644
index 19bafc2f..00000000
--- a/entity-templates/ShoppingCartDonation.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartDonation extends StorableClass(ShoppingCartDonation) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartDonation.fields.itemId)
-		val amount = new DoubleFieldValue(self, ShoppingCartDonation.fields.amount)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartDonation.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartDonation.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartDonation.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartDonation.fields.updatedBy)
-		val orderId = new IntFieldValue(self, ShoppingCartDonation.fields.orderId)
-		val fundId = new IntFieldValue(self, ShoppingCartDonation.fields.fundId)
-		val initiativeId = new IntFieldValue(self, ShoppingCartDonation.fields.initiativeId)
-		val inMemoryOf = new NullableStringFieldValue(self, ShoppingCartDonation.fields.inMemoryOf)
-		val isAnon = new NullableBooleanFIeldValue(self, ShoppingCartDonation.fields.isAnon)
-	}
-}
-
-object ShoppingCartDonation extends StorableObject[ShoppingCartDonation] {
-	val entityName: String = "SHOPPING_CART_DONATIONS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val amount = new DoubleDatabaseField(self, "AMOUNT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val fundId = new IntDatabaseField(self, "FUND_ID")
-		val initiativeId = new IntDatabaseField(self, "INITIATIVE_ID")
-		val inMemoryOf = new NullableStringDatabaseField(self, "IN_MEMORY_OF", 500)
-		val isAnon = new NullableBooleanDatabaseField(self, "IS_ANON")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartGc.scala b/entity-templates/ShoppingCartGc.scala
deleted file mode 100644
index 1fe22054..00000000
--- a/entity-templates/ShoppingCartGc.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartGc extends StorableClass(ShoppingCartGc) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartGc.fields.itemId)
-		val membershipTypeId = new NullableIntFieldValue(self, ShoppingCartGc.fields.membershipTypeId)
-		val orderId = new NullableIntFieldValue(self, ShoppingCartGc.fields.orderId)
-		val recipientEmail = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientEmail)
-		val certId = new NullableIntFieldValue(self, ShoppingCartGc.fields.certId)
-		val readyToBuy = new NullableBooleanFIeldValue(self, ShoppingCartGc.fields.readyToBuy)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartGc.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartGc.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartGc.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartGc.fields.updatedBy)
-		val recipientNameFirst = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientNameFirst)
-		val recipientNameLast = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientNameLast)
-		val recipientAddr1 = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientAddr1)
-		val recipientAddr2 = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientAddr2)
-		val recipientCity = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientCity)
-		val recipientState = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientState)
-		val recipientZip = new NullableStringFieldValue(self, ShoppingCartGc.fields.recipientZip)
-		val deliveryMethod = new BooleanFIeldValue(self, ShoppingCartGc.fields.deliveryMethod)
-		val message = new NullableUnknownFieldType(self, ShoppingCartGc.fields.message)
-		val whoseAddr = new NullableBooleanFIeldValue(self, ShoppingCartGc.fields.whoseAddr)
-		val purchasePrice = new NullableDoubleFieldValue(self, ShoppingCartGc.fields.purchasePrice)
-		val value = new NullableDoubleFieldValue(self, ShoppingCartGc.fields.value)
-		val whoseEmail = new NullableBooleanFIeldValue(self, ShoppingCartGc.fields.whoseEmail)
-		val discountInstanceId = new NullableIntFieldValue(self, ShoppingCartGc.fields.discountInstanceId)
-	}
-}
-
-object ShoppingCartGc extends StorableObject[ShoppingCartGc] {
-	val entityName: String = "SHOPPING_CART_GCS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val recipientEmail = new NullableStringDatabaseField(self, "RECIPIENT_EMAIL", 500)
-		val certId = new NullableIntDatabaseField(self, "CERT_ID")
-		val readyToBuy = new NullableBooleanDatabaseField(self, "READY_TO_BUY")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val recipientNameFirst = new NullableStringDatabaseField(self, "RECIPIENT_NAME_FIRST", 200)
-		val recipientNameLast = new NullableStringDatabaseField(self, "RECIPIENT_NAME_LAST", 200)
-		val recipientAddr1 = new NullableStringDatabaseField(self, "RECIPIENT_ADDR_1", 500)
-		val recipientAddr2 = new NullableStringDatabaseField(self, "RECIPIENT_ADDR_2", 500)
-		val recipientCity = new NullableStringDatabaseField(self, "RECIPIENT_CITY", 100)
-		val recipientState = new NullableStringDatabaseField(self, "RECIPIENT_STATE", 5)
-		val recipientZip = new NullableStringDatabaseField(self, "RECIPIENT_ZIP", 20)
-		val deliveryMethod = new BooleanDatabaseField(self, "DELIVERY_METHOD")
-		val message = new NullableUnknownFieldType(self, "MESSAGE")
-		val whoseAddr = new NullableBooleanDatabaseField(self, "WHOSE_ADDR")
-		val purchasePrice = new NullableDoubleDatabaseField(self, "PURCHASE_PRICE")
-		val value = new NullableDoubleDatabaseField(self, "VALUE")
-		val whoseEmail = new NullableBooleanDatabaseField(self, "WHOSE_EMAIL")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartGuestPriv.scala b/entity-templates/ShoppingCartGuestPriv.scala
deleted file mode 100644
index d58031aa..00000000
--- a/entity-templates/ShoppingCartGuestPriv.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartGuestPriv extends StorableClass(ShoppingCartGuestPriv) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartGuestPriv.fields.itemId)
-		val orderId = new NullableIntFieldValue(self, ShoppingCartGuestPriv.fields.orderId)
-		val price = new NullableDoubleFieldValue(self, ShoppingCartGuestPriv.fields.price)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartGuestPriv.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartGuestPriv.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartGuestPriv.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartGuestPriv.fields.updatedBy)
-		val scMembershipId = new NullableIntFieldValue(self, ShoppingCartGuestPriv.fields.scMembershipId)
-		val realMembershipId = new NullableIntFieldValue(self, ShoppingCartGuestPriv.fields.realMembershipId)
-	}
-}
-
-object ShoppingCartGuestPriv extends StorableObject[ShoppingCartGuestPriv] {
-	val entityName: String = "SHOPPING_CART_GUEST_PRIVS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val scMembershipId = new NullableIntDatabaseField(self, "SC_MEMBERSHIP_ID")
-		val realMembershipId = new NullableIntDatabaseField(self, "REAL_MEMBERSHIP_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartJpc.scala b/entity-templates/ShoppingCartJpc.scala
deleted file mode 100644
index 5eac20e7..00000000
--- a/entity-templates/ShoppingCartJpc.scala
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartJpc extends StorableClass(ShoppingCartJpc) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartJpc.fields.itemId)
-		val personId = new NullableIntFieldValue(self, ShoppingCartJpc.fields.personId)
-		val orderId = new NullableIntFieldValue(self, ShoppingCartJpc.fields.orderId)
-		val instanceId = new NullableIntFieldValue(self, ShoppingCartJpc.fields.instanceId)
-		val readyToBuy = new NullableBooleanFIeldValue(self, ShoppingCartJpc.fields.readyToBuy)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartJpc.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartJpc.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartJpc.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartJpc.fields.updatedBy)
-		val price = new NullableDoubleFieldValue(self, ShoppingCartJpc.fields.price)
-		val discountInstanceId = new NullableIntFieldValue(self, ShoppingCartJpc.fields.discountInstanceId)
-		val discountAmt = new NullableDoubleFieldValue(self, ShoppingCartJpc.fields.discountAmt)
-	}
-}
-
-object ShoppingCartJpc extends StorableObject[ShoppingCartJpc] {
-	val entityName: String = "SHOPPING_CART_JPC"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val instanceId = new NullableIntDatabaseField(self, "INSTANCE_ID")
-		val readyToBuy = new NullableBooleanDatabaseField(self, "READY_TO_BUY")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val price = new NullableDoubleDatabaseField(self, "PRICE")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartMembership.scala b/entity-templates/ShoppingCartMembership.scala
deleted file mode 100644
index 52d48cad..00000000
--- a/entity-templates/ShoppingCartMembership.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartMembership extends StorableClass(ShoppingCartMembership) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartMembership.fields.itemId)
-		val membershipTypeId = new NullableIntFieldValue(self, ShoppingCartMembership.fields.membershipTypeId)
-		val price = new DoubleFieldValue(self, ShoppingCartMembership.fields.price)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartMembership.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartMembership.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartMembership.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartMembership.fields.updatedBy)
-		val personId = new IntFieldValue(self, ShoppingCartMembership.fields.personId)
-		val readyToBuy = new BooleanFIeldValue(self, ShoppingCartMembership.fields.readyToBuy)
-		val orderId = new IntFieldValue(self, ShoppingCartMembership.fields.orderId)
-		val specNeedsApproved = new NullableBooleanFIeldValue(self, ShoppingCartMembership.fields.specNeedsApproved)
-		val discountAmt = new NullableDoubleFieldValue(self, ShoppingCartMembership.fields.discountAmt)
-		val discountInstanceId = new NullableIntFieldValue(self, ShoppingCartMembership.fields.discountInstanceId)
-		val discountId = new NullableIntFieldValue(self, ShoppingCartMembership.fields.discountId)
-		val hasJpClassReservations = new NullableBooleanFIeldValue(self, ShoppingCartMembership.fields.hasJpClassReservations)
-		val requestedDiscountInstanceId = new NullableIntFieldValue(self, ShoppingCartMembership.fields.requestedDiscountInstanceId)
-	}
-}
-
-object ShoppingCartMembership extends StorableObject[ShoppingCartMembership] {
-	val entityName: String = "SHOPPING_CART_MEMBERSHIPS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val price = new DoubleDatabaseField(self, "PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val readyToBuy = new BooleanDatabaseField(self, "READY_TO_BUY")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val specNeedsApproved = new NullableBooleanDatabaseField(self, "SPEC_NEEDS_APPROVED")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val discountId = new NullableIntDatabaseField(self, "DISCOUNT_ID")
-		val hasJpClassReservations = new NullableBooleanDatabaseField(self, "HAS_JP_CLASS_RESERVATIONS")
-		val requestedDiscountInstanceId = new NullableIntDatabaseField(self, "REQUESTED_DISCOUNT_INSTANCE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartMembershipsArch.scala b/entity-templates/ShoppingCartMembershipsArch.scala
deleted file mode 100644
index 8bc37f26..00000000
--- a/entity-templates/ShoppingCartMembershipsArch.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartMembershipsArch extends StorableClass(ShoppingCartMembershipsArch) {
-	object values extends ValuesObject {
-		val itemId = new NullableIntFieldValue(self, ShoppingCartMembershipsArch.fields.itemId)
-		val membershipTypeId = new NullableIntFieldValue(self, ShoppingCartMembershipsArch.fields.membershipTypeId)
-		val price = new DoubleFieldValue(self, ShoppingCartMembershipsArch.fields.price)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartMembershipsArch.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartMembershipsArch.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartMembershipsArch.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartMembershipsArch.fields.updatedBy)
-		val personId = new IntFieldValue(self, ShoppingCartMembershipsArch.fields.personId)
-		val readyToBuy = new BooleanFIeldValue(self, ShoppingCartMembershipsArch.fields.readyToBuy)
-		val orderId = new IntFieldValue(self, ShoppingCartMembershipsArch.fields.orderId)
-		val specNeedsApproved = new NullableBooleanFIeldValue(self, ShoppingCartMembershipsArch.fields.specNeedsApproved)
-		val discountAmt = new NullableDoubleFieldValue(self, ShoppingCartMembershipsArch.fields.discountAmt)
-		val discountId = new NullableIntFieldValue(self, ShoppingCartMembershipsArch.fields.discountId)
-		val discountInstanceId = new NullableIntFieldValue(self, ShoppingCartMembershipsArch.fields.discountInstanceId)
-		val hasJpClassReservations = new NullableBooleanFIeldValue(self, ShoppingCartMembershipsArch.fields.hasJpClassReservations)
-		val requestedDiscountInstanceId = new NullableIntFieldValue(self, ShoppingCartMembershipsArch.fields.requestedDiscountInstanceId)
-	}
-}
-
-object ShoppingCartMembershipsArch extends StorableObject[ShoppingCartMembershipsArch] {
-	val entityName: String = "SHOPPING_CART_MEMBERSHIPS_ARCH"
-
-	object fields extends FieldsObject {
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val price = new DoubleDatabaseField(self, "PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val readyToBuy = new BooleanDatabaseField(self, "READY_TO_BUY")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val specNeedsApproved = new NullableBooleanDatabaseField(self, "SPEC_NEEDS_APPROVED")
-		val discountAmt = new NullableDoubleDatabaseField(self, "DISCOUNT_AMT")
-		val discountId = new NullableIntDatabaseField(self, "DISCOUNT_ID")
-		val discountInstanceId = new NullableIntDatabaseField(self, "DISCOUNT_INSTANCE_ID")
-		val hasJpClassReservations = new NullableBooleanDatabaseField(self, "HAS_JP_CLASS_RESERVATIONS")
-		val requestedDiscountInstanceId = new NullableIntDatabaseField(self, "REQUESTED_DISCOUNT_INSTANCE_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/ShoppingCartWaiver.scala b/entity-templates/ShoppingCartWaiver.scala
deleted file mode 100644
index ea3eb450..00000000
--- a/entity-templates/ShoppingCartWaiver.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ShoppingCartWaiver extends StorableClass(ShoppingCartWaiver) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, ShoppingCartWaiver.fields.itemId)
-		val orderId = new IntFieldValue(self, ShoppingCartWaiver.fields.orderId)
-		val personId = new NullableIntFieldValue(self, ShoppingCartWaiver.fields.personId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartWaiver.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, ShoppingCartWaiver.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, ShoppingCartWaiver.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, ShoppingCartWaiver.fields.updatedBy)
-		val price = new DoubleFieldValue(self, ShoppingCartWaiver.fields.price)
-	}
-}
-
-object ShoppingCartWaiver extends StorableObject[ShoppingCartWaiver] {
-	val entityName: String = "SHOPPING_CART_WAIVERS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val price = new DoubleDatabaseField(self, "PRICE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/Signout.scala b/entity-templates/Signout.scala
deleted file mode 100644
index 9706716d..00000000
--- a/entity-templates/Signout.scala
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Signout extends StorableClass(Signout) {
-	object values extends ValuesObject {
-		val signoutId = new IntFieldValue(self, Signout.fields.signoutId)
-		val programId = new IntFieldValue(self, Signout.fields.programId)
-		val boatId = new IntFieldValue(self, Signout.fields.boatId)
-		val cardNum = new NullableStringFieldValue(self, Signout.fields.cardNum)
-		val sailNumber = new NullableStringFieldValue(self, Signout.fields.sailNumber)
-		val signoutDatetime = new NullableLocalDateTimeFieldValue(self, Signout.fields.signoutDatetime)
-		val signinDatetime = new NullableLocalDateTimeFieldValue(self, Signout.fields.signinDatetime)
-		val testRatingId = new NullableIntFieldValue(self, Signout.fields.testRatingId)
-		val testResult = new NullableStringFieldValue(self, Signout.fields.testResult)
-		val signoutType = new BooleanFIeldValue(self, Signout.fields.signoutType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Signout.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Signout.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Signout.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Signout.fields.updatedBy)
-		val didCapsize = new NullableBooleanFIeldValue(self, Signout.fields.didCapsize)
-		val isQueued = new BooleanFIeldValue(self, Signout.fields.isQueued)
-		val queueOrder = new NullableDoubleFieldValue(self, Signout.fields.queueOrder)
-		val personId = new NullableIntFieldValue(self, Signout.fields.personId)
-		val comments = new NullableStringFieldValue(self, Signout.fields.comments)
-		val oldCrewCount = new NullableDoubleFieldValue(self, Signout.fields.oldCrewCount)
-		val oldYouthCount = new NullableDoubleFieldValue(self, Signout.fields.oldYouthCount)
-		val oldStudentCount = new NullableDoubleFieldValue(self, Signout.fields.oldStudentCount)
-		val oldRunAground = new NullableBooleanFIeldValue(self, Signout.fields.oldRunAground)
-		val oldFirstName = new NullableStringFieldValue(self, Signout.fields.oldFirstName)
-		val oldLastName = new NullableStringFieldValue(self, Signout.fields.oldLastName)
-		val jpAttendanceId = new NullableIntFieldValue(self, Signout.fields.jpAttendanceId)
-		val apAttendanceId = new NullableIntFieldValue(self, Signout.fields.apAttendanceId)
-		val hullNumber = new NullableStringFieldValue(self, Signout.fields.hullNumber)
-	}
-}
-
-object Signout extends StorableObject[Signout] {
-	val entityName: String = "SIGNOUTS"
-
-	object fields extends FieldsObject {
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val sailNumber = new NullableStringDatabaseField(self, "SAIL_NUMBER", 15)
-		val signoutDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNOUT_DATETIME")
-		val signinDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNIN_DATETIME")
-		val testRatingId = new NullableIntDatabaseField(self, "TEST_RATING_ID")
-		val testResult = new NullableStringDatabaseField(self, "TEST_RESULT", 10)
-		val signoutType = new BooleanDatabaseField(self, "SIGNOUT_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val didCapsize = new NullableBooleanDatabaseField(self, "DID_CAPSIZE")
-		val isQueued = new BooleanDatabaseField(self, "IS_QUEUED")
-		val queueOrder = new NullableDoubleDatabaseField(self, "QUEUE_ORDER")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val comments = new NullableStringDatabaseField(self, "COMMENTS", 4000)
-		val oldCrewCount = new NullableDoubleDatabaseField(self, "OLD_CREW_COUNT")
-		val oldYouthCount = new NullableDoubleDatabaseField(self, "OLD_YOUTH_COUNT")
-		val oldStudentCount = new NullableDoubleDatabaseField(self, "OLD_STUDENT_COUNT")
-		val oldRunAground = new NullableBooleanDatabaseField(self, "OLD_RUN_AGROUND")
-		val oldFirstName = new NullableStringDatabaseField(self, "OLD_FIRST_NAME", 500)
-		val oldLastName = new NullableStringDatabaseField(self, "OLD_LAST_NAME", 500)
-		val jpAttendanceId = new NullableIntDatabaseField(self, "JP_ATTENDANCE_ID")
-		val apAttendanceId = new NullableIntDatabaseField(self, "AP_ATTENDANCE_ID")
-		val hullNumber = new NullableStringDatabaseField(self, "HULL_NUMBER", 15)
-	}
-
-	def primaryKey: IntDatabaseField = fields.signoutId
-}
\ No newline at end of file
diff --git a/entity-templates/SignoutCrew.scala b/entity-templates/SignoutCrew.scala
deleted file mode 100644
index c8eec8bf..00000000
--- a/entity-templates/SignoutCrew.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SignoutCrew extends StorableClass(SignoutCrew) {
-	object values extends ValuesObject {
-		val crewId = new IntFieldValue(self, SignoutCrew.fields.crewId)
-		val cardNum = new NullableStringFieldValue(self, SignoutCrew.fields.cardNum)
-		val signoutId = new NullableIntFieldValue(self, SignoutCrew.fields.signoutId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SignoutCrew.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SignoutCrew.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SignoutCrew.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SignoutCrew.fields.updatedBy)
-		val personId = new NullableIntFieldValue(self, SignoutCrew.fields.personId)
-		val startActive = new NullableLocalDateTimeFieldValue(self, SignoutCrew.fields.startActive)
-		val endActive = new NullableLocalDateTimeFieldValue(self, SignoutCrew.fields.endActive)
-		val oldFirstName = new NullableStringFieldValue(self, SignoutCrew.fields.oldFirstName)
-		val oldLastName = new NullableStringFieldValue(self, SignoutCrew.fields.oldLastName)
-		val jpAttendanceId = new NullableIntFieldValue(self, SignoutCrew.fields.jpAttendanceId)
-		val apAttendanceId = new NullableIntFieldValue(self, SignoutCrew.fields.apAttendanceId)
-	}
-}
-
-object SignoutCrew extends StorableObject[SignoutCrew] {
-	val entityName: String = "SIGNOUT_CREW"
-
-	object fields extends FieldsObject {
-		val crewId = new IntDatabaseField(self, "CREW_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val signoutId = new NullableIntDatabaseField(self, "SIGNOUT_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val startActive = new NullableLocalDateTimeDatabaseField(self, "START_ACTIVE")
-		val endActive = new NullableLocalDateTimeDatabaseField(self, "END_ACTIVE")
-		val oldFirstName = new NullableStringDatabaseField(self, "OLD_FIRST_NAME", 100)
-		val oldLastName = new NullableStringDatabaseField(self, "OLD_LAST_NAME", 100)
-		val jpAttendanceId = new NullableIntDatabaseField(self, "JP_ATTENDANCE_ID")
-		val apAttendanceId = new NullableIntDatabaseField(self, "AP_ATTENDANCE_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.crewId
-}
\ No newline at end of file
diff --git a/entity-templates/SignoutSnapshot.scala b/entity-templates/SignoutSnapshot.scala
deleted file mode 100644
index 58865162..00000000
--- a/entity-templates/SignoutSnapshot.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SignoutSnapshot extends StorableClass(SignoutSnapshot) {
-	object values extends ValuesObject {
-		val snapshotDatetime = new LocalDateTimeFieldValue(self, SignoutSnapshot.fields.snapshotDatetime)
-		val programId = new IntFieldValue(self, SignoutSnapshot.fields.programId)
-		val boatId = new IntFieldValue(self, SignoutSnapshot.fields.boatId)
-		val flag = new NullableBooleanFIeldValue(self, SignoutSnapshot.fields.flag)
-		val signoutCount = new DoubleFieldValue(self, SignoutSnapshot.fields.signoutCount)
-		val definiteCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.definiteCount)
-		val maybeCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.maybeCount)
-		val pinkDefiniteCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.pinkDefiniteCount)
-		val pinkMaybeCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.pinkMaybeCount)
-		val pinkProbableCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.pinkProbableCount)
-		val pinkProbablyNotCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.pinkProbablyNotCount)
-		val pinkSignoutCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.pinkSignoutCount)
-		val probableCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.probableCount)
-		val probablyNotCount = new NullableDoubleFieldValue(self, SignoutSnapshot.fields.probablyNotCount)
-		val pruneDupes = new NullableBooleanFIeldValue(self, SignoutSnapshot.fields.pruneDupes)
-	}
-}
-
-object SignoutSnapshot extends StorableObject[SignoutSnapshot] {
-	val entityName: String = "SIGNOUT_SNAPSHOTS"
-
-	object fields extends FieldsObject {
-		val snapshotDatetime = new LocalDateTimeDatabaseField(self, "SNAPSHOT_DATETIME")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val flag = new NullableBooleanDatabaseField(self, "FLAG")
-		val signoutCount = new DoubleDatabaseField(self, "SIGNOUT_COUNT")
-		val definiteCount = new NullableDoubleDatabaseField(self, "DEFINITE_COUNT")
-		val maybeCount = new NullableDoubleDatabaseField(self, "MAYBE_COUNT")
-		val pinkDefiniteCount = new NullableDoubleDatabaseField(self, "PINK_DEFINITE_COUNT")
-		val pinkMaybeCount = new NullableDoubleDatabaseField(self, "PINK_MAYBE_COUNT")
-		val pinkProbableCount = new NullableDoubleDatabaseField(self, "PINK_PROBABLE_COUNT")
-		val pinkProbablyNotCount = new NullableDoubleDatabaseField(self, "PINK_PROBABLY_NOT_COUNT")
-		val pinkSignoutCount = new NullableDoubleDatabaseField(self, "PINK_SIGNOUT_COUNT")
-		val probableCount = new NullableDoubleDatabaseField(self, "PROBABLE_COUNT")
-		val probablyNotCount = new NullableDoubleDatabaseField(self, "PROBABLY_NOT_COUNT")
-		val pruneDupes = new NullableBooleanDatabaseField(self, "PRUNE_DUPES")
-	}
-
-	def primaryKey: IntDatabaseField = fields.snapshotDatetime
-}
\ No newline at end of file
diff --git a/entity-templates/SignoutsDebug.scala b/entity-templates/SignoutsDebug.scala
deleted file mode 100644
index 940b0306..00000000
--- a/entity-templates/SignoutsDebug.scala
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SignoutsDebug extends StorableClass(SignoutsDebug) {
-	object values extends ValuesObject {
-		val signoutId = new NullableIntFieldValue(self, SignoutsDebug.fields.signoutId)
-		val programId = new IntFieldValue(self, SignoutsDebug.fields.programId)
-		val boatId = new IntFieldValue(self, SignoutsDebug.fields.boatId)
-		val cardNum = new NullableStringFieldValue(self, SignoutsDebug.fields.cardNum)
-		val sailNumber = new NullableStringFieldValue(self, SignoutsDebug.fields.sailNumber)
-		val signoutDatetime = new NullableLocalDateTimeFieldValue(self, SignoutsDebug.fields.signoutDatetime)
-		val signinDatetime = new NullableLocalDateTimeFieldValue(self, SignoutsDebug.fields.signinDatetime)
-		val testRatingId = new NullableIntFieldValue(self, SignoutsDebug.fields.testRatingId)
-		val testResult = new NullableStringFieldValue(self, SignoutsDebug.fields.testResult)
-		val signoutType = new BooleanFIeldValue(self, SignoutsDebug.fields.signoutType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SignoutsDebug.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SignoutsDebug.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SignoutsDebug.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SignoutsDebug.fields.updatedBy)
-		val didCapsize = new NullableBooleanFIeldValue(self, SignoutsDebug.fields.didCapsize)
-		val isQueued = new BooleanFIeldValue(self, SignoutsDebug.fields.isQueued)
-		val queueOrder = new NullableDoubleFieldValue(self, SignoutsDebug.fields.queueOrder)
-		val personId = new NullableIntFieldValue(self, SignoutsDebug.fields.personId)
-		val comments = new NullableStringFieldValue(self, SignoutsDebug.fields.comments)
-		val oldCrewCount = new NullableDoubleFieldValue(self, SignoutsDebug.fields.oldCrewCount)
-		val oldYouthCount = new NullableDoubleFieldValue(self, SignoutsDebug.fields.oldYouthCount)
-		val oldStudentCount = new NullableDoubleFieldValue(self, SignoutsDebug.fields.oldStudentCount)
-		val oldRunAground = new NullableBooleanFIeldValue(self, SignoutsDebug.fields.oldRunAground)
-		val oldFirstName = new NullableStringFieldValue(self, SignoutsDebug.fields.oldFirstName)
-		val oldLastName = new NullableStringFieldValue(self, SignoutsDebug.fields.oldLastName)
-		val jpAttendanceId = new NullableIntFieldValue(self, SignoutsDebug.fields.jpAttendanceId)
-		val apAttendanceId = new NullableIntFieldValue(self, SignoutsDebug.fields.apAttendanceId)
-		val snapshotType = new NullableBooleanFIeldValue(self, SignoutsDebug.fields.snapshotType)
-		val snapshotDatetime = new NullableLocalDateTimeFieldValue(self, SignoutsDebug.fields.snapshotDatetime)
-		val snapshotId = new IntFieldValue(self, SignoutsDebug.fields.snapshotId)
-	}
-}
-
-object SignoutsDebug extends StorableObject[SignoutsDebug] {
-	val entityName: String = "SIGNOUTS_DEBUG"
-
-	object fields extends FieldsObject {
-		val signoutId = new NullableIntDatabaseField(self, "SIGNOUT_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val sailNumber = new NullableStringDatabaseField(self, "SAIL_NUMBER", 15)
-		val signoutDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNOUT_DATETIME")
-		val signinDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNIN_DATETIME")
-		val testRatingId = new NullableIntDatabaseField(self, "TEST_RATING_ID")
-		val testResult = new NullableStringDatabaseField(self, "TEST_RESULT", 10)
-		val signoutType = new BooleanDatabaseField(self, "SIGNOUT_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val didCapsize = new NullableBooleanDatabaseField(self, "DID_CAPSIZE")
-		val isQueued = new BooleanDatabaseField(self, "IS_QUEUED")
-		val queueOrder = new NullableDoubleDatabaseField(self, "QUEUE_ORDER")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val comments = new NullableStringDatabaseField(self, "COMMENTS", 4000)
-		val oldCrewCount = new NullableDoubleDatabaseField(self, "OLD_CREW_COUNT")
-		val oldYouthCount = new NullableDoubleDatabaseField(self, "OLD_YOUTH_COUNT")
-		val oldStudentCount = new NullableDoubleDatabaseField(self, "OLD_STUDENT_COUNT")
-		val oldRunAground = new NullableBooleanDatabaseField(self, "OLD_RUN_AGROUND")
-		val oldFirstName = new NullableStringDatabaseField(self, "OLD_FIRST_NAME", 500)
-		val oldLastName = new NullableStringDatabaseField(self, "OLD_LAST_NAME", 500)
-		val jpAttendanceId = new NullableIntDatabaseField(self, "JP_ATTENDANCE_ID")
-		val apAttendanceId = new NullableIntDatabaseField(self, "AP_ATTENDANCE_ID")
-		val snapshotType = new NullableBooleanDatabaseField(self, "SNAPSHOT_TYPE")
-		val snapshotDatetime = new NullableLocalDateTimeDatabaseField(self, "SNAPSHOT_DATETIME")
-		val snapshotId = new IntDatabaseField(self, "SNAPSHOT_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.snapshotId
-}
\ No newline at end of file
diff --git a/entity-templates/SignupsWithAttendance.scala b/entity-templates/SignupsWithAttendance.scala
deleted file mode 100644
index fd52985b..00000000
--- a/entity-templates/SignupsWithAttendance.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SignupsWithAttendance extends StorableClass(SignupsWithAttendance) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, SignupsWithAttendance.fields.personId)
-		val typeId = new IntFieldValue(self, SignupsWithAttendance.fields.typeId)
-		val typeName = new NullableStringFieldValue(self, SignupsWithAttendance.fields.typeName)
-		val week = new NullableDoubleFieldValue(self, SignupsWithAttendance.fields.week)
-		val instanceId = new IntFieldValue(self, SignupsWithAttendance.fields.instanceId)
-		val signupId = new IntFieldValue(self, SignupsWithAttendance.fields.signupId)
-		val ct = new NullableDoubleFieldValue(self, SignupsWithAttendance.fields.ct)
-		val attendCt = new NullableDoubleFieldValue(self, SignupsWithAttendance.fields.attendCt)
-	}
-}
-
-object SignupsWithAttendance extends StorableObject[SignupsWithAttendance] {
-	val entityName: String = "SIGNUPS_WITH_ATTENDANCE"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val typeName = new NullableStringDatabaseField(self, "TYPE_NAME", 100)
-		val week = new NullableDoubleDatabaseField(self, "WEEK")
-		val instanceId = new IntDatabaseField(self, "INSTANCE_ID")
-		val signupId = new IntDatabaseField(self, "SIGNUP_ID")
-		val ct = new NullableDoubleDatabaseField(self, "CT")
-		val attendCt = new NullableDoubleDatabaseField(self, "ATTEND_CT")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/SpecialNeed.scala b/entity-templates/SpecialNeed.scala
deleted file mode 100644
index e207a29b..00000000
--- a/entity-templates/SpecialNeed.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SpecialNeed extends StorableClass(SpecialNeed) {
-	object values extends ValuesObject {
-		val specId = new IntFieldValue(self, SpecialNeed.fields.specId)
-		val personId = new NullableIntFieldValue(self, SpecialNeed.fields.personId)
-		val membershipTypeId = new NullableIntFieldValue(self, SpecialNeed.fields.membershipTypeId)
-		val status = new NullableBooleanFIeldValue(self, SpecialNeed.fields.status)
-		val overridePrice = new NullableDoubleFieldValue(self, SpecialNeed.fields.overridePrice)
-		val authOn = new NullableLocalDateTimeFieldValue(self, SpecialNeed.fields.authOn)
-		val authBy = new NullableStringFieldValue(self, SpecialNeed.fields.authBy)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SpecialNeed.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SpecialNeed.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SpecialNeed.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SpecialNeed.fields.updatedBy)
-		val description = new NullableUnknownFieldType(self, SpecialNeed.fields.description)
-		val contactMethod = new NullableStringFieldValue(self, SpecialNeed.fields.contactMethod)
-		val phone = new NullableStringFieldValue(self, SpecialNeed.fields.phone)
-	}
-}
-
-object SpecialNeed extends StorableObject[SpecialNeed] {
-	val entityName: String = "SPECIAL_NEEDS"
-
-	object fields extends FieldsObject {
-		val specId = new IntDatabaseField(self, "SPEC_ID")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val membershipTypeId = new NullableIntDatabaseField(self, "MEMBERSHIP_TYPE_ID")
-		val status = new NullableBooleanDatabaseField(self, "STATUS")
-		val overridePrice = new NullableDoubleDatabaseField(self, "OVERRIDE_PRICE")
-		val authOn = new NullableLocalDateTimeDatabaseField(self, "AUTH_ON")
-		val authBy = new NullableStringDatabaseField(self, "AUTH_BY", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val description = new NullableUnknownFieldType(self, "DESCRIPTION")
-		val contactMethod = new NullableStringDatabaseField(self, "CONTACT_METHOD", 50)
-		val phone = new NullableStringDatabaseField(self, "PHONE", 20)
-	}
-
-	def primaryKey: IntDatabaseField = fields.specId
-}
\ No newline at end of file
diff --git a/entity-templates/StaggeredPaymentsReady.scala b/entity-templates/StaggeredPaymentsReady.scala
deleted file mode 100644
index 1c10bc7b..00000000
--- a/entity-templates/StaggeredPaymentsReady.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StaggeredPaymentsReady extends StorableClass(StaggeredPaymentsReady) {
-	object values extends ValuesObject {
-		val orderId = new IntFieldValue(self, StaggeredPaymentsReady.fields.orderId)
-		val staggerId = new IntFieldValue(self, StaggeredPaymentsReady.fields.staggerId)
-		val seq = new DoubleFieldValue(self, StaggeredPaymentsReady.fields.seq)
-		val expectedPaymentDate = new LocalDateTimeFieldValue(self, StaggeredPaymentsReady.fields.expectedPaymentDate)
-		val rawAmountInCents = new NullableDoubleFieldValue(self, StaggeredPaymentsReady.fields.rawAmountInCents)
-		val addlAmountInCents = new NullableDoubleFieldValue(self, StaggeredPaymentsReady.fields.addlAmountInCents)
-		val paymentIntentRowId = new NullableIntFieldValue(self, StaggeredPaymentsReady.fields.paymentIntentRowId)
-		val failedCron = new NullableBooleanFIeldValue(self, StaggeredPaymentsReady.fields.failedCron)
-	}
-}
-
-object StaggeredPaymentsReady extends StorableObject[StaggeredPaymentsReady] {
-	val entityName: String = "STAGGERED_PAYMENTS_READY"
-
-	object fields extends FieldsObject {
-		val orderId = new IntDatabaseField(self, "ORDER_ID")
-		val staggerId = new IntDatabaseField(self, "STAGGER_ID")
-		val seq = new DoubleDatabaseField(self, "SEQ")
-		val expectedPaymentDate = new LocalDateTimeDatabaseField(self, "EXPECTED_PAYMENT_DATE")
-		val rawAmountInCents = new NullableDoubleDatabaseField(self, "RAW_AMOUNT_IN_CENTS")
-		val addlAmountInCents = new NullableDoubleDatabaseField(self, "ADDL_AMOUNT_IN_CENTS")
-		val paymentIntentRowId = new NullableIntDatabaseField(self, "PAYMENT_INTENT_ROW_ID")
-		val failedCron = new NullableBooleanDatabaseField(self, "FAILED_CRON")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/State.scala b/entity-templates/State.scala
deleted file mode 100644
index ad4e6255..00000000
--- a/entity-templates/State.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class State extends StorableClass(State) {
-	object values extends ValuesObject {
-		val stateId = new IntFieldValue(self, State.fields.stateId)
-		val abbrev = new NullableStringFieldValue(self, State.fields.abbrev)
-		val stateName = new NullableStringFieldValue(self, State.fields.stateName)
-	}
-}
-
-object State extends StorableObject[State] {
-	val entityName: String = "STATES"
-
-	object fields extends FieldsObject {
-		val stateId = new IntDatabaseField(self, "STATE_ID")
-		val abbrev = new NullableStringDatabaseField(self, "ABBREV", 5)
-		val stateName = new NullableStringDatabaseField(self, "STATE_NAME", 70)
-	}
-
-	def primaryKey: IntDatabaseField = fields.stateId
-}
\ No newline at end of file
diff --git a/entity-templates/StripeBalanceTransaction.scala b/entity-templates/StripeBalanceTransaction.scala
deleted file mode 100644
index a1691d75..00000000
--- a/entity-templates/StripeBalanceTransaction.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripeBalanceTransaction extends StorableClass(StripeBalanceTransaction) {
-	object values extends ValuesObject {
-		val transactionId = new StringFieldValue(self, StripeBalanceTransaction.fields.transactionId)
-		val amountInCents = new NullableDoubleFieldValue(self, StripeBalanceTransaction.fields.amountInCents)
-		val description = new NullableStringFieldValue(self, StripeBalanceTransaction.fields.description)
-		val feeInCents = new NullableDoubleFieldValue(self, StripeBalanceTransaction.fields.feeInCents)
-		val netInCents = new NullableDoubleFieldValue(self, StripeBalanceTransaction.fields.netInCents)
-		val source = new NullableStringFieldValue(self, StripeBalanceTransaction.fields.source)
-		val status = new NullableStringFieldValue(self, StripeBalanceTransaction.fields.status)
-		val type = new NullableStringFieldValue(self, StripeBalanceTransaction.fields.type)
-		val payout = new NullableStringFieldValue(self, StripeBalanceTransaction.fields.payout)
-		val created = new NullableDoubleFieldValue(self, StripeBalanceTransaction.fields.created)
-	}
-}
-
-object StripeBalanceTransaction extends StorableObject[StripeBalanceTransaction] {
-	val entityName: String = "STRIPE_BALANCE_TRANSACTIONS"
-
-	object fields extends FieldsObject {
-		val transactionId = new StringDatabaseField(self, "TRANSACTION_ID", 50)
-		val amountInCents = new NullableDoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 500)
-		val feeInCents = new NullableDoubleDatabaseField(self, "FEE_IN_CENTS")
-		val netInCents = new NullableDoubleDatabaseField(self, "NET_IN_CENTS")
-		val source = new NullableStringDatabaseField(self, "SOURCE", 50)
-		val status = new NullableStringDatabaseField(self, "STATUS", 20)
-		val type = new NullableStringDatabaseField(self, "TYPE", 20)
-		val payout = new NullableStringDatabaseField(self, "PAYOUT", 50)
-		val created = new NullableDoubleDatabaseField(self, "CREATED")
-	}
-
-	def primaryKey: IntDatabaseField = fields.transactionId
-}
\ No newline at end of file
diff --git a/entity-templates/StripeCharge.scala b/entity-templates/StripeCharge.scala
deleted file mode 100644
index ef58f546..00000000
--- a/entity-templates/StripeCharge.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripeCharge extends StorableClass(StripeCharge) {
-	object values extends ValuesObject {
-		val chargeId = new StringFieldValue(self, StripeCharge.fields.chargeId)
-		val amountInCents = new NullableDoubleFieldValue(self, StripeCharge.fields.amountInCents)
-		val createdEpoch = new NullableDoubleFieldValue(self, StripeCharge.fields.createdEpoch)
-		val closeId = new NullableIntFieldValue(self, StripeCharge.fields.closeId)
-		val orderId = new NullableIntFieldValue(self, StripeCharge.fields.orderId)
-		val token = new NullableStringFieldValue(self, StripeCharge.fields.token)
-		val paid = new NullableBooleanFIeldValue(self, StripeCharge.fields.paid)
-		val status = new NullableStringFieldValue(self, StripeCharge.fields.status)
-		val createdDatetime = new NullableLocalDateTimeFieldValue(self, StripeCharge.fields.createdDatetime)
-		val refunds = new NullableStringFieldValue(self, StripeCharge.fields.refunds)
-		val description = new NullableStringFieldValue(self, StripeCharge.fields.description)
-	}
-}
-
-object StripeCharge extends StorableObject[StripeCharge] {
-	val entityName: String = "STRIPE_CHARGES"
-
-	object fields extends FieldsObject {
-		val chargeId = new StringDatabaseField(self, "CHARGE_ID", 50)
-		val amountInCents = new NullableDoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val createdEpoch = new NullableDoubleDatabaseField(self, "CREATED_EPOCH")
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val token = new NullableStringDatabaseField(self, "TOKEN", 50)
-		val paid = new NullableBooleanDatabaseField(self, "PAID")
-		val status = new NullableStringDatabaseField(self, "STATUS", 20)
-		val createdDatetime = new NullableLocalDateTimeDatabaseField(self, "CREATED_DATETIME")
-		val refunds = new NullableStringDatabaseField(self, "REFUNDS", 200)
-		val description = new NullableStringDatabaseField(self, "DESCRIPTION", 200)
-	}
-
-	def primaryKey: IntDatabaseField = fields.chargeId
-}
\ No newline at end of file
diff --git a/entity-templates/StripeChargeAttLog.scala b/entity-templates/StripeChargeAttLog.scala
deleted file mode 100644
index 25b3cb9f..00000000
--- a/entity-templates/StripeChargeAttLog.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripeChargeAttLog extends StorableClass(StripeChargeAttLog) {
-	object values extends ValuesObject {
-		val attemptId = new IntFieldValue(self, StripeChargeAttLog.fields.attemptId)
-		val attemptDatetime = new NullableLocalDateTimeFieldValue(self, StripeChargeAttLog.fields.attemptDatetime)
-		val tokenId = new NullableIntFieldValue(self, StripeChargeAttLog.fields.tokenId)
-		val cartTotal = new NullableDoubleFieldValue(self, StripeChargeAttLog.fields.cartTotal)
-		val result = new NullableBooleanFIeldValue(self, StripeChargeAttLog.fields.result)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, StripeChargeAttLog.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, StripeChargeAttLog.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, StripeChargeAttLog.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, StripeChargeAttLog.fields.updatedBy)
-		val errorType = new NullableStringFieldValue(self, StripeChargeAttLog.fields.errorType)
-		val errorMsg = new NullableStringFieldValue(self, StripeChargeAttLog.fields.errorMsg)
-		val chargeNumber = new NullableStringFieldValue(self, StripeChargeAttLog.fields.chargeNumber)
-		val chargeTotal = new NullableDoubleFieldValue(self, StripeChargeAttLog.fields.chargeTotal)
-		val orderId = new NullableIntFieldValue(self, StripeChargeAttLog.fields.orderId)
-		val paymentIntentRowId = new NullableIntFieldValue(self, StripeChargeAttLog.fields.paymentIntentRowId)
-	}
-}
-
-object StripeChargeAttLog extends StorableObject[StripeChargeAttLog] {
-	val entityName: String = "STRIPE_CHARGE_ATT_LOG"
-
-	object fields extends FieldsObject {
-		val attemptId = new IntDatabaseField(self, "ATTEMPT_ID")
-		val attemptDatetime = new NullableLocalDateTimeDatabaseField(self, "ATTEMPT_DATETIME")
-		val tokenId = new NullableIntDatabaseField(self, "TOKEN_ID")
-		val cartTotal = new NullableDoubleDatabaseField(self, "CART_TOTAL")
-		val result = new NullableBooleanDatabaseField(self, "RESULT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val errorType = new NullableStringDatabaseField(self, "ERROR_TYPE", 100)
-		val errorMsg = new NullableStringDatabaseField(self, "ERROR_MSG", 4000)
-		val chargeNumber = new NullableStringDatabaseField(self, "CHARGE_NUMBER", 100)
-		val chargeTotal = new NullableDoubleDatabaseField(self, "CHARGE_TOTAL")
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val paymentIntentRowId = new NullableIntDatabaseField(self, "PAYMENT_INTENT_ROW_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.attemptId
-}
\ No newline at end of file
diff --git a/entity-templates/StripePayout.scala b/entity-templates/StripePayout.scala
deleted file mode 100644
index d68f0356..00000000
--- a/entity-templates/StripePayout.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripePayout extends StorableClass(StripePayout) {
-	object values extends ValuesObject {
-		val payoutId = new StringFieldValue(self, StripePayout.fields.payoutId)
-		val amountInCents = new NullableDoubleFieldValue(self, StripePayout.fields.amountInCents)
-		val arrivalDatetime = new NullableLocalDateTimeFieldValue(self, StripePayout.fields.arrivalDatetime)
-		val balanceTransactionId = new NullableStringFieldValue(self, StripePayout.fields.balanceTransactionId)
-		val status = new NullableStringFieldValue(self, StripePayout.fields.status)
-	}
-}
-
-object StripePayout extends StorableObject[StripePayout] {
-	val entityName: String = "STRIPE_PAYOUTS"
-
-	object fields extends FieldsObject {
-		val payoutId = new StringDatabaseField(self, "PAYOUT_ID", 50)
-		val amountInCents = new NullableDoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-		val arrivalDatetime = new NullableLocalDateTimeDatabaseField(self, "ARRIVAL_DATETIME")
-		val balanceTransactionId = new NullableStringDatabaseField(self, "BALANCE_TRANSACTION_ID", 50)
-		val status = new NullableStringDatabaseField(self, "STATUS", 50)
-	}
-
-	def primaryKey: IntDatabaseField = fields.payoutId
-}
\ No newline at end of file
diff --git a/entity-templates/StripeRefund.scala b/entity-templates/StripeRefund.scala
deleted file mode 100644
index 3ab0d235..00000000
--- a/entity-templates/StripeRefund.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripeRefund extends StorableClass(StripeRefund) {
-	object values extends ValuesObject {
-		val refundId = new StringFieldValue(self, StripeRefund.fields.refundId)
-		val chargeId = new NullableStringFieldValue(self, StripeRefund.fields.chargeId)
-		val closeId = new NullableIntFieldValue(self, StripeRefund.fields.closeId)
-		val amountInCents = new NullableDoubleFieldValue(self, StripeRefund.fields.amountInCents)
-	}
-}
-
-object StripeRefund extends StorableObject[StripeRefund] {
-	val entityName: String = "STRIPE_REFUNDS"
-
-	object fields extends FieldsObject {
-		val refundId = new StringDatabaseField(self, "REFUND_ID", 50)
-		val chargeId = new NullableStringDatabaseField(self, "CHARGE_ID", 50)
-		val closeId = new NullableIntDatabaseField(self, "CLOSE_ID")
-		val amountInCents = new NullableDoubleDatabaseField(self, "AMOUNT_IN_CENTS")
-	}
-
-	def primaryKey: IntDatabaseField = fields.refundId
-}
\ No newline at end of file
diff --git a/entity-templates/StripeToken.scala b/entity-templates/StripeToken.scala
deleted file mode 100644
index d9820d16..00000000
--- a/entity-templates/StripeToken.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class StripeToken extends StorableClass(StripeToken) {
-	object values extends ValuesObject {
-		val tokenId = new IntFieldValue(self, StripeToken.fields.tokenId)
-		val token = new NullableStringFieldValue(self, StripeToken.fields.token)
-		val orderId = new NullableIntFieldValue(self, StripeToken.fields.orderId)
-		val createdDatetime = new NullableLocalDateTimeFieldValue(self, StripeToken.fields.createdDatetime)
-		val cardLastDigits = new NullableStringFieldValue(self, StripeToken.fields.cardLastDigits)
-		val cardExpMonth = new NullableDoubleFieldValue(self, StripeToken.fields.cardExpMonth)
-		val cardExpYear = new NullableDoubleFieldValue(self, StripeToken.fields.cardExpYear)
-		val cardZip = new NullableStringFieldValue(self, StripeToken.fields.cardZip)
-		val active = new BooleanFIeldValue(self, StripeToken.fields.active)
-	}
-}
-
-object StripeToken extends StorableObject[StripeToken] {
-	val entityName: String = "STRIPE_TOKENS"
-
-	object fields extends FieldsObject {
-		val tokenId = new IntDatabaseField(self, "TOKEN_ID")
-		val token = new NullableStringDatabaseField(self, "TOKEN", 50)
-		val orderId = new NullableIntDatabaseField(self, "ORDER_ID")
-		val createdDatetime = new NullableLocalDateTimeDatabaseField(self, "CREATED_DATETIME")
-		val cardLastDigits = new NullableStringDatabaseField(self, "CARD_LAST_DIGITS", 10)
-		val cardExpMonth = new NullableDoubleDatabaseField(self, "CARD_EXP_MONTH")
-		val cardExpYear = new NullableDoubleDatabaseField(self, "CARD_EXP_YEAR")
-		val cardZip = new NullableStringDatabaseField(self, "CARD_ZIP", 20)
-		val active = new BooleanDatabaseField(self, "ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.tokenId
-}
\ No newline at end of file
diff --git a/entity-templates/Sunset.scala b/entity-templates/Sunset.scala
deleted file mode 100644
index 2c26af5a..00000000
--- a/entity-templates/Sunset.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Sunset extends StorableClass(Sunset) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, Sunset.fields.id)
-		val sunsetDatetime = new NullableLocalDateTimeFieldValue(self, Sunset.fields.sunsetDatetime)
-	}
-}
-
-object Sunset extends StorableObject[Sunset] {
-	val entityName: String = "SUNSETS"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val sunsetDatetime = new NullableLocalDateTimeDatabaseField(self, "SUNSET_DATETIME")
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/SwimProofMethod.scala b/entity-templates/SwimProofMethod.scala
deleted file mode 100644
index aa696bfa..00000000
--- a/entity-templates/SwimProofMethod.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SwimProofMethod extends StorableClass(SwimProofMethod) {
-	object values extends ValuesObject {
-		val methodId = new IntFieldValue(self, SwimProofMethod.fields.methodId)
-		val methodName = new StringFieldValue(self, SwimProofMethod.fields.methodName)
-		val active = new NullableBooleanFIeldValue(self, SwimProofMethod.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, SwimProofMethod.fields.displayOrder)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SwimProofMethod.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SwimProofMethod.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SwimProofMethod.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SwimProofMethod.fields.updatedBy)
-	}
-}
-
-object SwimProofMethod extends StorableObject[SwimProofMethod] {
-	val entityName: String = "SWIM_PROOF_METHODS"
-
-	object fields extends FieldsObject {
-		val methodId = new IntDatabaseField(self, "METHOD_ID")
-		val methodName = new StringDatabaseField(self, "METHOD_NAME", 4000)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.methodId
-}
\ No newline at end of file
diff --git a/entity-templates/SymonRun.scala b/entity-templates/SymonRun.scala
deleted file mode 100644
index 3147bd80..00000000
--- a/entity-templates/SymonRun.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SymonRun extends StorableClass(SymonRun) {
-	object values extends ValuesObject {
-		val runId = new IntFieldValue(self, SymonRun.fields.runId)
-		val hostName = new NullableStringFieldValue(self, SymonRun.fields.hostName)
-		val programName = new NullableStringFieldValue(self, SymonRun.fields.programName)
-		val status = new NullableDoubleFieldValue(self, SymonRun.fields.status)
-		val macAddress = new NullableStringFieldValue(self, SymonRun.fields.macAddress)
-		val runDatetime = new NullableLocalDateTimeFieldValue(self, SymonRun.fields.runDatetime)
-		val badHash = new NullableBooleanFIeldValue(self, SymonRun.fields.badHash)
-		val argString = new NullableStringFieldValue(self, SymonRun.fields.argString)
-		val symonVersion = new NullableStringFieldValue(self, SymonRun.fields.symonVersion)
-	}
-}
-
-object SymonRun extends StorableObject[SymonRun] {
-	val entityName: String = "SYMON_RUNS"
-
-	object fields extends FieldsObject {
-		val runId = new IntDatabaseField(self, "RUN_ID")
-		val hostName = new NullableStringDatabaseField(self, "HOST_NAME", 50)
-		val programName = new NullableStringDatabaseField(self, "PROGRAM_NAME", 100)
-		val status = new NullableDoubleDatabaseField(self, "STATUS")
-		val macAddress = new NullableStringDatabaseField(self, "MAC_ADDRESS", 50)
-		val runDatetime = new NullableLocalDateTimeDatabaseField(self, "RUN_DATETIME")
-		val badHash = new NullableBooleanDatabaseField(self, "BAD_HASH")
-		val argString = new NullableStringDatabaseField(self, "ARG_STRING", 100)
-		val symonVersion = new NullableStringDatabaseField(self, "SYMON_VERSION", 5)
-	}
-
-	def primaryKey: IntDatabaseField = fields.runId
-}
\ No newline at end of file
diff --git a/entity-templates/SymonSchedule.scala b/entity-templates/SymonSchedule.scala
deleted file mode 100644
index 50f4ebdf..00000000
--- a/entity-templates/SymonSchedule.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class SymonSchedule extends StorableClass(SymonSchedule) {
-	object values extends ValuesObject {
-		val scheduleId = new IntFieldValue(self, SymonSchedule.fields.scheduleId)
-		val hostName = new NullableStringFieldValue(self, SymonSchedule.fields.hostName)
-		val programName = new NullableStringFieldValue(self, SymonSchedule.fields.programName)
-		val argString = new NullableStringFieldValue(self, SymonSchedule.fields.argString)
-		val freqDays = new NullableDoubleFieldValue(self, SymonSchedule.fields.freqDays)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, SymonSchedule.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, SymonSchedule.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, SymonSchedule.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, SymonSchedule.fields.updatedBy)
-		val symonVersion = new NullableStringFieldValue(self, SymonSchedule.fields.symonVersion)
-	}
-}
-
-object SymonSchedule extends StorableObject[SymonSchedule] {
-	val entityName: String = "SYMON_SCHEDULE"
-
-	object fields extends FieldsObject {
-		val scheduleId = new IntDatabaseField(self, "SCHEDULE_ID")
-		val hostName = new NullableStringDatabaseField(self, "HOST_NAME", 50)
-		val programName = new NullableStringDatabaseField(self, "PROGRAM_NAME", 50)
-		val argString = new NullableStringDatabaseField(self, "ARG_STRING", 100)
-		val freqDays = new NullableDoubleDatabaseField(self, "FREQ_DAYS")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val symonVersion = new NullableStringDatabaseField(self, "SYMON_VERSION", 5)
-	}
-
-	def primaryKey: IntDatabaseField = fields.scheduleId
-}
\ No newline at end of file
diff --git a/entity-templates/TableInfo.scala b/entity-templates/TableInfo.scala
deleted file mode 100644
index 4f09f33d..00000000
--- a/entity-templates/TableInfo.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class TableInfo extends StorableClass(TableInfo) {
-	object values extends ValuesObject {
-		val tableId = new IntFieldValue(self, TableInfo.fields.tableId)
-		val tableName = new NullableStringFieldValue(self, TableInfo.fields.tableName)
-		val biTriggerName = new NullableStringFieldValue(self, TableInfo.fields.biTriggerName)
-		val sequenceName = new NullableStringFieldValue(self, TableInfo.fields.sequenceName)
-		val pkColumn = new NullableStringFieldValue(self, TableInfo.fields.pkColumn)
-		val isLookup = new NullableBooleanFIeldValue(self, TableInfo.fields.isLookup)
-		val hasPersonId = new NullableBooleanFIeldValue(self, TableInfo.fields.hasPersonId)
-	}
-}
-
-object TableInfo extends StorableObject[TableInfo] {
-	val entityName: String = "TABLE_INFO"
-
-	object fields extends FieldsObject {
-		val tableId = new IntDatabaseField(self, "TABLE_ID")
-		val tableName = new NullableStringDatabaseField(self, "TABLE_NAME", 100)
-		val biTriggerName = new NullableStringDatabaseField(self, "BI_TRIGGER_NAME", 100)
-		val sequenceName = new NullableStringDatabaseField(self, "SEQUENCE_NAME", 100)
-		val pkColumn = new NullableStringDatabaseField(self, "PK_COLUMN", 100)
-		val isLookup = new NullableBooleanDatabaseField(self, "IS_LOOKUP")
-		val hasPersonId = new NullableBooleanDatabaseField(self, "HAS_PERSON_ID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.tableId
-}
\ No newline at end of file
diff --git a/entity-templates/Tag.scala b/entity-templates/Tag.scala
deleted file mode 100644
index c46e7507..00000000
--- a/entity-templates/Tag.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class Tag extends StorableClass(Tag) {
-	object values extends ValuesObject {
-		val tagId = new IntFieldValue(self, Tag.fields.tagId)
-		val tagName = new NullableStringFieldValue(self, Tag.fields.tagName)
-		val active = new NullableBooleanFIeldValue(self, Tag.fields.active)
-		val displayOrder = new NullableDoubleFieldValue(self, Tag.fields.displayOrder)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, Tag.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, Tag.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, Tag.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, Tag.fields.updatedBy)
-	}
-}
-
-object Tag extends StorableObject[Tag] {
-	val entityName: String = "TAGS"
-
-	object fields extends FieldsObject {
-		val tagId = new IntDatabaseField(self, "TAG_ID")
-		val tagName = new NullableStringDatabaseField(self, "TAG_NAME", 100)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-		val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.tagId
-}
\ No newline at end of file
diff --git a/entity-templates/TempMakeIndice.scala b/entity-templates/TempMakeIndice.scala
deleted file mode 100644
index b69fb0a6..00000000
--- a/entity-templates/TempMakeIndice.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class TempMakeIndice extends StorableClass(TempMakeIndice) {
-	object values extends ValuesObject {
-		val id = new IntFieldValue(self, TempMakeIndice.fields.id)
-		val tableName = new NullableStringFieldValue(self, TempMakeIndice.fields.tableName)
-		val fkColumn = new NullableStringFieldValue(self, TempMakeIndice.fields.fkColumn)
-	}
-}
-
-object TempMakeIndice extends StorableObject[TempMakeIndice] {
-	val entityName: String = "TEMP_MAKE_INDICES"
-
-	object fields extends FieldsObject {
-		val id = new IntDatabaseField(self, "ID")
-		val tableName = new NullableStringDatabaseField(self, "TABLE_NAME", 30)
-		val fkColumn = new NullableStringDatabaseField(self, "FK_COLUMN", 30)
-	}
-
-	def primaryKey: IntDatabaseField = fields.id
-}
\ No newline at end of file
diff --git a/entity-templates/TempNoshow.scala b/entity-templates/TempNoshow.scala
deleted file mode 100644
index d59dc38c..00000000
--- a/entity-templates/TempNoshow.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class TempNoshow extends StorableClass(TempNoshow) {
-	object values extends ValuesObject {
-		val typeId = new IntFieldValue(self, TempNoshow.fields.typeId)
-		val week = new NullableDoubleFieldValue(self, TempNoshow.fields.week)
-		val noshow = new NullableDoubleFieldValue(self, TempNoshow.fields.noshow)
-	}
-}
-
-object TempNoshow extends StorableObject[TempNoshow] {
-	val entityName: String = "TEMP_NOSHOW"
-
-	object fields extends FieldsObject {
-		val typeId = new IntDatabaseField(self, "TYPE_ID")
-		val week = new NullableDoubleDatabaseField(self, "WEEK")
-		val noshow = new NullableDoubleDatabaseField(self, "NOSHOW")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/TextFile.scala b/entity-templates/TextFile.scala
deleted file mode 100644
index 290b4167..00000000
--- a/entity-templates/TextFile.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class TextFile extends StorableClass(TextFile) {
-	object values extends ValuesObject {
-		val fileId = new IntFieldValue(self, TextFile.fields.fileId)
-		val fileName = new NullableStringFieldValue(self, TextFile.fields.fileName)
-		val mimeType = new NullableStringFieldValue(self, TextFile.fields.mimeType)
-		val clobContent = new NullableUnknownFieldType(self, TextFile.fields.clobContent)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, TextFile.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, TextFile.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, TextFile.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, TextFile.fields.updatedBy)
-	}
-}
-
-object TextFile extends StorableObject[TextFile] {
-	val entityName: String = "TEXT_FILES"
-
-	object fields extends FieldsObject {
-		val fileId = new IntDatabaseField(self, "FILE_ID")
-		val fileName = new NullableStringDatabaseField(self, "FILE_NAME", 100)
-		val mimeType = new NullableStringDatabaseField(self, "MIME_TYPE", 100)
-		val clobContent = new NullableUnknownFieldType(self, "CLOB_CONTENT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.fileId
-}
\ No newline at end of file
diff --git a/entity-templates/TodaysSignout.scala b/entity-templates/TodaysSignout.scala
deleted file mode 100644
index c94bf0bc..00000000
--- a/entity-templates/TodaysSignout.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class TodaysSignout extends StorableClass(TodaysSignout) {
-	object values extends ValuesObject {
-		val signoutId = new IntFieldValue(self, TodaysSignout.fields.signoutId)
-		val programId = new IntFieldValue(self, TodaysSignout.fields.programId)
-		val boatId = new IntFieldValue(self, TodaysSignout.fields.boatId)
-		val cardNum = new NullableStringFieldValue(self, TodaysSignout.fields.cardNum)
-		val sailNumber = new NullableStringFieldValue(self, TodaysSignout.fields.sailNumber)
-		val signoutDatetime = new NullableLocalDateTimeFieldValue(self, TodaysSignout.fields.signoutDatetime)
-		val signinDatetime = new NullableLocalDateTimeFieldValue(self, TodaysSignout.fields.signinDatetime)
-		val testRatingId = new NullableIntFieldValue(self, TodaysSignout.fields.testRatingId)
-		val testResult = new NullableStringFieldValue(self, TodaysSignout.fields.testResult)
-		val signoutType = new BooleanFIeldValue(self, TodaysSignout.fields.signoutType)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, TodaysSignout.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, TodaysSignout.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, TodaysSignout.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, TodaysSignout.fields.updatedBy)
-		val didCapsize = new NullableBooleanFIeldValue(self, TodaysSignout.fields.didCapsize)
-		val isQueued = new BooleanFIeldValue(self, TodaysSignout.fields.isQueued)
-		val queueOrder = new NullableDoubleFieldValue(self, TodaysSignout.fields.queueOrder)
-		val personId = new NullableIntFieldValue(self, TodaysSignout.fields.personId)
-		val comments = new NullableStringFieldValue(self, TodaysSignout.fields.comments)
-		val oldCrewCount = new NullableDoubleFieldValue(self, TodaysSignout.fields.oldCrewCount)
-		val oldYouthCount = new NullableDoubleFieldValue(self, TodaysSignout.fields.oldYouthCount)
-		val oldStudentCount = new NullableDoubleFieldValue(self, TodaysSignout.fields.oldStudentCount)
-		val oldRunAground = new NullableBooleanFIeldValue(self, TodaysSignout.fields.oldRunAground)
-		val oldFirstName = new NullableStringFieldValue(self, TodaysSignout.fields.oldFirstName)
-		val oldLastName = new NullableStringFieldValue(self, TodaysSignout.fields.oldLastName)
-		val jpAttendanceId = new NullableIntFieldValue(self, TodaysSignout.fields.jpAttendanceId)
-		val hullNumber = new NullableStringFieldValue(self, TodaysSignout.fields.hullNumber)
-	}
-}
-
-object TodaysSignout extends StorableObject[TodaysSignout] {
-	val entityName: String = "TODAYS_SIGNOUTS"
-
-	object fields extends FieldsObject {
-		val signoutId = new IntDatabaseField(self, "SIGNOUT_ID")
-		val programId = new IntDatabaseField(self, "PROGRAM_ID")
-		val boatId = new IntDatabaseField(self, "BOAT_ID")
-		val cardNum = new NullableStringDatabaseField(self, "CARD_NUM", 50)
-		val sailNumber = new NullableStringDatabaseField(self, "SAIL_NUMBER", 15)
-		val signoutDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNOUT_DATETIME")
-		val signinDatetime = new NullableLocalDateTimeDatabaseField(self, "SIGNIN_DATETIME")
-		val testRatingId = new NullableIntDatabaseField(self, "TEST_RATING_ID")
-		val testResult = new NullableStringDatabaseField(self, "TEST_RESULT", 10)
-		val signoutType = new BooleanDatabaseField(self, "SIGNOUT_TYPE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val didCapsize = new NullableBooleanDatabaseField(self, "DID_CAPSIZE")
-		val isQueued = new BooleanDatabaseField(self, "IS_QUEUED")
-		val queueOrder = new NullableDoubleDatabaseField(self, "QUEUE_ORDER")
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-		val comments = new NullableStringDatabaseField(self, "COMMENTS", 4000)
-		val oldCrewCount = new NullableDoubleDatabaseField(self, "OLD_CREW_COUNT")
-		val oldYouthCount = new NullableDoubleDatabaseField(self, "OLD_YOUTH_COUNT")
-		val oldStudentCount = new NullableDoubleDatabaseField(self, "OLD_STUDENT_COUNT")
-		val oldRunAground = new NullableBooleanDatabaseField(self, "OLD_RUN_AGROUND")
-		val oldFirstName = new NullableStringDatabaseField(self, "OLD_FIRST_NAME", 500)
-		val oldLastName = new NullableStringDatabaseField(self, "OLD_LAST_NAME", 500)
-		val jpAttendanceId = new NullableIntDatabaseField(self, "JP_ATTENDANCE_ID")
-		val hullNumber = new NullableStringDatabaseField(self, "HULL_NUMBER", 15)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/UapComment.scala b/entity-templates/UapComment.scala
deleted file mode 100644
index 137e031b..00000000
--- a/entity-templates/UapComment.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UapComment extends StorableClass(UapComment) {
-	object values extends ValuesObject {
-		val personId = new IntFieldValue(self, UapComment.fields.personId)
-		val uapComment = new NullableUnknownFieldType(self, UapComment.fields.uapComment)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, UapComment.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, UapComment.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, UapComment.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, UapComment.fields.updatedBy)
-	}
-}
-
-object UapComment extends StorableObject[UapComment] {
-	val entityName: String = "UAP_COMMENTS"
-
-	object fields extends FieldsObject {
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val uapComment = new NullableUnknownFieldType(self, "UAP_COMMENT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.personId
-}
\ No newline at end of file
diff --git a/entity-templates/UapGroup.scala b/entity-templates/UapGroup.scala
deleted file mode 100644
index b0af04cc..00000000
--- a/entity-templates/UapGroup.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UapGroup extends StorableClass(UapGroup) {
-	object values extends ValuesObject {
-		val uapGroupId = new IntFieldValue(self, UapGroup.fields.uapGroupId)
-		val groupName = new NullableStringFieldValue(self, UapGroup.fields.groupName)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, UapGroup.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, UapGroup.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, UapGroup.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, UapGroup.fields.updatedBy)
-		val active = new NullableBooleanFIeldValue(self, UapGroup.fields.active)
-	}
-}
-
-object UapGroup extends StorableObject[UapGroup] {
-	val entityName: String = "UAP_GROUPS"
-
-	object fields extends FieldsObject {
-		val uapGroupId = new IntDatabaseField(self, "UAP_GROUP_ID")
-		val groupName = new NullableStringDatabaseField(self, "GROUP_NAME", 50)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val active = new NullableBooleanDatabaseField(self, "ACTIVE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.uapGroupId
-}
\ No newline at end of file
diff --git a/entity-templates/UapGroupPrice.scala b/entity-templates/UapGroupPrice.scala
deleted file mode 100644
index 48df0721..00000000
--- a/entity-templates/UapGroupPrice.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UapGroupPrice extends StorableClass(UapGroupPrice) {
-	object values extends ValuesObject {
-		val priceId = new IntFieldValue(self, UapGroupPrice.fields.priceId)
-		val uapGroupId = new NullableIntFieldValue(self, UapGroupPrice.fields.uapGroupId)
-		val effectiveDatetime = new NullableLocalDateTimeFieldValue(self, UapGroupPrice.fields.effectiveDatetime)
-		val unitPrice = new NullableDoubleFieldValue(self, UapGroupPrice.fields.unitPrice)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, UapGroupPrice.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, UapGroupPrice.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, UapGroupPrice.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, UapGroupPrice.fields.updatedBy)
-	}
-}
-
-object UapGroupPrice extends StorableObject[UapGroupPrice] {
-	val entityName: String = "UAP_GROUP_PRICES"
-
-	object fields extends FieldsObject {
-		val priceId = new IntDatabaseField(self, "PRICE_ID")
-		val uapGroupId = new NullableIntDatabaseField(self, "UAP_GROUP_ID")
-		val effectiveDatetime = new NullableLocalDateTimeDatabaseField(self, "EFFECTIVE_DATETIME")
-		val unitPrice = new NullableDoubleDatabaseField(self, "UNIT_PRICE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.priceId
-}
\ No newline at end of file
diff --git a/entity-templates/UngrantedTable.scala b/entity-templates/UngrantedTable.scala
deleted file mode 100644
index 32f9612c..00000000
--- a/entity-templates/UngrantedTable.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UngrantedTable extends StorableClass(UngrantedTable) {
-	object values extends ValuesObject {
-		val tableName = new NullableStringFieldValue(self, UngrantedTable.fields.tableName)
-	}
-}
-
-object UngrantedTable extends StorableObject[UngrantedTable] {
-	val entityName: String = "UNGRANTED_TABLES"
-
-	object fields extends FieldsObject {
-		val tableName = new NullableStringDatabaseField(self, "TABLE_NAME", 128)
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/UnitTestScratch.scala b/entity-templates/UnitTestScratch.scala
deleted file mode 100644
index 47d31e5b..00000000
--- a/entity-templates/UnitTestScratch.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UnitTestScratch extends StorableClass(UnitTestScratch) {
-	object values extends ValuesObject {
-		val pk = new DoubleFieldValue(self, UnitTestScratch.fields.pk)
-		val colNumber = new NullableDoubleFieldValue(self, UnitTestScratch.fields.colNumber)
-		val colVarchar10 = new NullableStringFieldValue(self, UnitTestScratch.fields.colVarchar10)
-		val colDate = new NullableLocalDateTimeFieldValue(self, UnitTestScratch.fields.colDate)
-		val colTimestamp = new NullableUnknownFieldType(self, UnitTestScratch.fields.colTimestamp)
-		val colClob = new NullableUnknownFieldType(self, UnitTestScratch.fields.colClob)
-		val colChar = new NullableBooleanFIeldValue(self, UnitTestScratch.fields.colChar)
-	}
-}
-
-object UnitTestScratch extends StorableObject[UnitTestScratch] {
-	val entityName: String = "UNIT_TEST_SCRATCH"
-
-	object fields extends FieldsObject {
-		val pk = new DoubleDatabaseField(self, "PK")
-		val colNumber = new NullableDoubleDatabaseField(self, "COL_NUMBER")
-		val colVarchar10 = new NullableStringDatabaseField(self, "COL_VARCHAR_10", 10)
-		val colDate = new NullableLocalDateTimeDatabaseField(self, "COL_DATE")
-		val colTimestamp = new NullableUnknownFieldType(self, "COL_TIMESTAMP")
-		val colClob = new NullableUnknownFieldType(self, "COL_CLOB")
-		val colChar = new NullableBooleanDatabaseField(self, "COL_CHAR")
-	}
-
-	def primaryKey: IntDatabaseField = fields.pk
-}
\ No newline at end of file
diff --git a/entity-templates/User.scala b/entity-templates/User.scala
deleted file mode 100644
index ac778331..00000000
--- a/entity-templates/User.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class User extends StorableClass(User) {
-	object values extends ValuesObject {
-		val userId = new IntFieldValue(self, User.fields.userId)
-		val userName = new StringFieldValue(self, User.fields.userName)
-		val pwHash = new NullableStringFieldValue(self, User.fields.pwHash)
-		val email = new StringFieldValue(self, User.fields.email)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, User.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, User.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, User.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, User.fields.updatedBy)
-		val locked = new NullableBooleanFIeldValue(self, User.fields.locked)
-		val pwChangeReqd = new NullableBooleanFIeldValue(self, User.fields.pwChangeReqd)
-		val badAttempts = new NullableDoubleFieldValue(self, User.fields.badAttempts)
-		val nameFirst = new NullableStringFieldValue(self, User.fields.nameFirst)
-		val nameLast = new NullableStringFieldValue(self, User.fields.nameLast)
-		val sagePwCipher = new NullableStringFieldValue(self, User.fields.sagePwCipher)
-		val sageToAdd = new NullableStringFieldValue(self, User.fields.sageToAdd)
-		val active = new BooleanFIeldValue(self, User.fields.active)
-		val hideFromClose = new NullableBooleanFIeldValue(self, User.fields.hideFromClose)
-		val pwHashScheme = new NullableStringFieldValue(self, User.fields.pwHashScheme)
-		val authNonce = new NullableStringFieldValue(self, User.fields.authNonce)
-		val userType = new BooleanFIeldValue(self, User.fields.userType)
-	}
-}
-
-object User extends StorableObject[User] {
-	val entityName: String = "USERS"
-
-	object fields extends FieldsObject {
-		val userId = new IntDatabaseField(self, "USER_ID")
-		val userName = new StringDatabaseField(self, "USER_NAME", 50)
-		val pwHash = new NullableStringDatabaseField(self, "PW_HASH", 500)
-		val email = new StringDatabaseField(self, "EMAIL", 100)
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val locked = new NullableBooleanDatabaseField(self, "LOCKED")
-		val pwChangeReqd = new NullableBooleanDatabaseField(self, "PW_CHANGE_REQD")
-		val badAttempts = new NullableDoubleDatabaseField(self, "BAD_ATTEMPTS")
-		val nameFirst = new NullableStringDatabaseField(self, "NAME_FIRST", 100)
-		val nameLast = new NullableStringDatabaseField(self, "NAME_LAST", 100)
-		val sagePwCipher = new NullableStringDatabaseField(self, "SAGE_PW_CIPHER", 4000)
-		val sageToAdd = new NullableStringDatabaseField(self, "SAGE_TO_ADD", 4000)
-		val active = new BooleanDatabaseField(self, "ACTIVE")
-		val hideFromClose = new NullableBooleanDatabaseField(self, "HIDE_FROM_CLOSE")
-		val pwHashScheme = new NullableStringDatabaseField(self, "PW_HASH_SCHEME", 20)
-		val authNonce = new NullableStringDatabaseField(self, "AUTH_NONCE", 20)
-		val userType = new BooleanDatabaseField(self, "USER_TYPE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.userId
-}
\ No newline at end of file
diff --git a/entity-templates/UserPreferenceValue.scala b/entity-templates/UserPreferenceValue.scala
deleted file mode 100644
index 4cd342d8..00000000
--- a/entity-templates/UserPreferenceValue.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UserPreferenceValue extends StorableClass(UserPreferenceValue) {
-	object values extends ValuesObject {
-		val prefId = new IntFieldValue(self, UserPreferenceValue.fields.prefId)
-		val prefAlias = new StringFieldValue(self, UserPreferenceValue.fields.prefAlias)
-		val userId = new NullableIntFieldValue(self, UserPreferenceValue.fields.userId)
-		val prefValue = new NullableBooleanFIeldValue(self, UserPreferenceValue.fields.prefValue)
-	}
-}
-
-object UserPreferenceValue extends StorableObject[UserPreferenceValue] {
-	val entityName: String = "USER_PREFERENCE_VALUES"
-
-	object fields extends FieldsObject {
-		val prefId = new IntDatabaseField(self, "PREF_ID")
-		val prefAlias = new StringDatabaseField(self, "PREF_ALIAS", 50)
-		val userId = new NullableIntDatabaseField(self, "USER_ID")
-		val prefValue = new NullableBooleanDatabaseField(self, "PREF_VALUE")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/UsersIp.scala b/entity-templates/UsersIp.scala
deleted file mode 100644
index 93f151da..00000000
--- a/entity-templates/UsersIp.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UsersIp extends StorableClass(UsersIp) {
-	object values extends ValuesObject {
-		val userId = new IntFieldValue(self, UsersIp.fields.userId)
-		val ipAddress = new StringFieldValue(self, UsersIp.fields.ipAddress)
-		val firstDatetime = new NullableLocalDateTimeFieldValue(self, UsersIp.fields.firstDatetime)
-		val lastDatetime = new NullableLocalDateTimeFieldValue(self, UsersIp.fields.lastDatetime)
-		val useCount = new NullableDoubleFieldValue(self, UsersIp.fields.useCount)
-	}
-}
-
-object UsersIp extends StorableObject[UsersIp] {
-	val entityName: String = "USERS_IPS"
-
-	object fields extends FieldsObject {
-		val userId = new IntDatabaseField(self, "USER_ID")
-		val ipAddress = new StringDatabaseField(self, "IP_ADDRESS", 50)
-		val firstDatetime = new NullableLocalDateTimeDatabaseField(self, "FIRST_DATETIME")
-		val lastDatetime = new NullableLocalDateTimeDatabaseField(self, "LAST_DATETIME")
-		val useCount = new NullableDoubleDatabaseField(self, "USE_COUNT")
-	}
-
-	def primaryKey: IntDatabaseField = fields.userId
-}
\ No newline at end of file
diff --git a/entity-templates/UsersPreference.scala b/entity-templates/UsersPreference.scala
deleted file mode 100644
index 381f6686..00000000
--- a/entity-templates/UsersPreference.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class UsersPreference extends StorableClass(UsersPreference) {
-	object values extends ValuesObject {
-		val rowId = new IntFieldValue(self, UsersPreference.fields.rowId)
-		val userId = new NullableIntFieldValue(self, UsersPreference.fields.userId)
-		val prefId = new NullableIntFieldValue(self, UsersPreference.fields.prefId)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, UsersPreference.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, UsersPreference.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, UsersPreference.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, UsersPreference.fields.updatedBy)
-		val valueFakeboolean = new NullableBooleanFIeldValue(self, UsersPreference.fields.valueFakeboolean)
-	}
-}
-
-object UsersPreference extends StorableObject[UsersPreference] {
-	val entityName: String = "USERS_PREFERENCES"
-
-	object fields extends FieldsObject {
-		val rowId = new IntDatabaseField(self, "ROW_ID")
-		val userId = new NullableIntDatabaseField(self, "USER_ID")
-		val prefId = new NullableIntDatabaseField(self, "PREF_ID")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val valueFakeboolean = new NullableBooleanDatabaseField(self, "VALUE_FAKEBOOLEAN")
-	}
-
-	def primaryKey: IntDatabaseField = fields.rowId
-}
\ No newline at end of file
diff --git a/entity-templates/ValidPerson.scala b/entity-templates/ValidPerson.scala
deleted file mode 100644
index 2a964ca4..00000000
--- a/entity-templates/ValidPerson.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ValidPerson extends StorableClass(ValidPerson) {
-	object values extends ValuesObject {
-		val personId = new NullableIntFieldValue(self, ValidPerson.fields.personId)
-	}
-}
-
-object ValidPerson extends StorableObject[ValidPerson] {
-	val entityName: String = "VALID_PERSONS"
-
-	object fields extends FieldsObject {
-		val personId = new NullableIntDatabaseField(self, "PERSON_ID")
-	}
-}
\ No newline at end of file
diff --git a/entity-templates/VerifyEmailReq.scala b/entity-templates/VerifyEmailReq.scala
deleted file mode 100644
index 0c80f33b..00000000
--- a/entity-templates/VerifyEmailReq.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class VerifyEmailReq extends StorableClass(VerifyEmailReq) {
-	object values extends ValuesObject {
-		val reqId = new IntFieldValue(self, VerifyEmailReq.fields.reqId)
-		val email = new StringFieldValue(self, VerifyEmailReq.fields.email)
-		val token = new StringFieldValue(self, VerifyEmailReq.fields.token)
-		val reqDatetime = new LocalDateTimeFieldValue(self, VerifyEmailReq.fields.reqDatetime)
-		val personId = new IntFieldValue(self, VerifyEmailReq.fields.personId)
-		val isValid = new NullableBooleanFIeldValue(self, VerifyEmailReq.fields.isValid)
-	}
-}
-
-object VerifyEmailReq extends StorableObject[VerifyEmailReq] {
-	val entityName: String = "VERIFY_EMAIL_REQS"
-
-	object fields extends FieldsObject {
-		val reqId = new IntDatabaseField(self, "REQ_ID")
-		val email = new StringDatabaseField(self, "EMAIL", 1000)
-		val token = new StringDatabaseField(self, "TOKEN", 50)
-		val reqDatetime = new LocalDateTimeDatabaseField(self, "REQ_DATETIME")
-		val personId = new IntDatabaseField(self, "PERSON_ID")
-		val isValid = new NullableBooleanDatabaseField(self, "IS_VALID")
-	}
-
-	def primaryKey: IntDatabaseField = fields.reqId
-}
\ No newline at end of file
diff --git a/entity-templates/WikiEntrie.scala b/entity-templates/WikiEntrie.scala
deleted file mode 100644
index a5af2c59..00000000
--- a/entity-templates/WikiEntrie.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class WikiEntrie extends StorableClass(WikiEntrie) {
-	object values extends ValuesObject {
-		val entryId = new IntFieldValue(self, WikiEntrie.fields.entryId)
-		val app = new NullableDoubleFieldValue(self, WikiEntrie.fields.app)
-		val page = new NullableDoubleFieldValue(self, WikiEntrie.fields.page)
-		val content = new NullableUnknownFieldType(self, WikiEntrie.fields.content)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, WikiEntrie.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, WikiEntrie.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, WikiEntrie.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, WikiEntrie.fields.updatedBy)
-	}
-}
-
-object WikiEntrie extends StorableObject[WikiEntrie] {
-	val entityName: String = "WIKI_ENTRIES"
-
-	object fields extends FieldsObject {
-		val entryId = new IntDatabaseField(self, "ENTRY_ID")
-		val app = new NullableDoubleDatabaseField(self, "APP")
-		val page = new NullableDoubleDatabaseField(self, "PAGE")
-		val content = new NullableUnknownFieldType(self, "CONTENT")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-	}
-
-	def primaryKey: IntDatabaseField = fields.entryId
-}
\ No newline at end of file
diff --git a/entity-templates/YearlyDate.scala b/entity-templates/YearlyDate.scala
deleted file mode 100644
index e5dd331c..00000000
--- a/entity-templates/YearlyDate.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class YearlyDate extends StorableClass(YearlyDate) {
-	object values extends ValuesObject {
-		val dateId = new IntFieldValue(self, YearlyDate.fields.dateId)
-		val year = new NullableDoubleFieldValue(self, YearlyDate.fields.year)
-		val itemId = new NullableIntFieldValue(self, YearlyDate.fields.itemId)
-		val startDate = new NullableLocalDateTimeFieldValue(self, YearlyDate.fields.startDate)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, YearlyDate.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, YearlyDate.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, YearlyDate.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, YearlyDate.fields.updatedBy)
-		val endDate = new NullableLocalDateTimeFieldValue(self, YearlyDate.fields.endDate)
-	}
-}
-
-object YearlyDate extends StorableObject[YearlyDate] {
-	val entityName: String = "YEARLY_DATES"
-
-	object fields extends FieldsObject {
-		val dateId = new IntDatabaseField(self, "DATE_ID")
-		val year = new NullableDoubleDatabaseField(self, "YEAR")
-		val itemId = new NullableIntDatabaseField(self, "ITEM_ID")
-		val startDate = new NullableLocalDateTimeDatabaseField(self, "START_DATE")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val endDate = new NullableLocalDateTimeDatabaseField(self, "END_DATE")
-	}
-
-	def primaryKey: IntDatabaseField = fields.dateId
-}
\ No newline at end of file
diff --git a/entity-templates/YearlyDateItem.scala b/entity-templates/YearlyDateItem.scala
deleted file mode 100644
index f8c03c2d..00000000
--- a/entity-templates/YearlyDateItem.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class YearlyDateItem extends StorableClass(YearlyDateItem) {
-	object values extends ValuesObject {
-		val itemId = new IntFieldValue(self, YearlyDateItem.fields.itemId)
-		val itemAlias = new NullableStringFieldValue(self, YearlyDateItem.fields.itemAlias)
-		val itemDescription = new NullableStringFieldValue(self, YearlyDateItem.fields.itemDescription)
-		val alertIfUnset = new NullableBooleanFIeldValue(self, YearlyDateItem.fields.alertIfUnset)
-		val createdOn = new NullableLocalDateTimeFieldValue(self, YearlyDateItem.fields.createdOn)
-		val createdBy = new NullableStringFieldValue(self, YearlyDateItem.fields.createdBy)
-		val updatedOn = new NullableLocalDateTimeFieldValue(self, YearlyDateItem.fields.updatedOn)
-		val updatedBy = new NullableStringFieldValue(self, YearlyDateItem.fields.updatedBy)
-		val valIfUndef = new NullableBooleanFIeldValue(self, YearlyDateItem.fields.valIfUndef)
-	}
-}
-
-object YearlyDateItem extends StorableObject[YearlyDateItem] {
-	val entityName: String = "YEARLY_DATE_ITEMS"
-
-	object fields extends FieldsObject {
-		val itemId = new IntDatabaseField(self, "ITEM_ID")
-		val itemAlias = new NullableStringDatabaseField(self, "ITEM_ALIAS", 50)
-		val itemDescription = new NullableStringDatabaseField(self, "ITEM_DESCRIPTION", 500)
-		val alertIfUnset = new NullableBooleanDatabaseField(self, "ALERT_IF_UNSET")
-		val createdOn = new NullableLocalDateTimeDatabaseField(self, "CREATED_ON")
-		val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500)
-		val updatedOn = new NullableLocalDateTimeDatabaseField(self, "UPDATED_ON")
-		val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500)
-		val valIfUndef = new NullableBooleanDatabaseField(self, "VAL_IF_UNDEF")
-	}
-
-	def primaryKey: IntDatabaseField = fields.itemId
-}
\ No newline at end of file
diff --git a/entity-templates/ZKeepalive.scala b/entity-templates/ZKeepalive.scala
deleted file mode 100644
index b96d75d3..00000000
--- a/entity-templates/ZKeepalive.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.sailcbi.APIServer.Entities.EntityDefinitions
-
-import com.coleji.neptune.Storable.FieldValues._
-import com.coleji.neptune.Storable.Fields._
-import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util.Initializable
-
-class ZKeepalive extends StorableClass(ZKeepalive) {
-	object values extends ValuesObject {
-		val a = new NullableDoubleFieldValue(self, ZKeepalive.fields.a)
-		val b = new NullableStringFieldValue(self, ZKeepalive.fields.b)
-	}
-}
-
-object ZKeepalive extends StorableObject[ZKeepalive] {
-	val entityName: String = "Z_KEEPALIVE"
-
-	object fields extends FieldsObject {
-		val a = new NullableDoubleDatabaseField(self, "A")
-		val b = new NullableStringDatabaseField(self, "B")
-	}
-}
\ No newline at end of file