From 3d47333665ea09554ab70f56c00cd42631f27035 Mon Sep 17 00:00:00 2001 From: Jonathan Percival Date: Mon, 16 Dec 2024 16:07:42 -0700 Subject: [PATCH] Move clasess to Kotlin folder --- .../org/cqframework/cql/cql2elm/CompilerOptions.kt | 0 .../org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt | 0 .../org/cqframework/cql/cql2elm/CqlCapability.kt | 0 .../org/cqframework/cql/cql2elm/CqlCompiler.kt | 0 .../org/cqframework/cql/cql2elm/CqlCompilerException.kt | 0 .../org/cqframework/cql/cql2elm/CqlCompilerOptions.kt | 0 .../org/cqframework/cql/cql2elm/CqlIncludeException.kt | 0 .../org/cqframework/cql/cql2elm/CqlInternalException.kt | 0 .../org/cqframework/cql/cql2elm/CqlSemanticException.kt | 0 .../org/cqframework/cql/cql2elm/CqlSyntaxException.kt | 0 .../org/cqframework/cql/cql2elm/CqlTranslator.kt | 0 .../org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt | 0 .../org/cqframework/cql/cql2elm/DataTypes.kt | 0 .../cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt | 0 .../cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt | 0 .../org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt | 0 .../org/cqframework/cql/cql2elm/IdentifierContext.kt | 0 .../org/cqframework/cql/cql2elm/LibraryBuilder.kt | 0 .../org/cqframework/cql/cql2elm/LibraryContentType.kt | 0 .../org/cqframework/cql/cql2elm/LibraryManager.kt | 0 .../org/cqframework/cql/cql2elm/LibraryReaderUtil.kt | 0 .../org/cqframework/cql/cql2elm/LibrarySourceLoader.kt | 0 .../org/cqframework/cql/cql2elm/LibrarySourceProvider.kt | 0 .../cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt | 0 .../{java => kotlin}/org/cqframework/cql/cql2elm/MimeType.kt | 0 .../org/cqframework/cql/cql2elm/ModelInfoLoader.kt | 0 .../org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt | 0 .../org/cqframework/cql/cql2elm/ModelManager.kt | 0 .../org/cqframework/cql/cql2elm/ModelResolver.kt | 0 .../org/cqframework/cql/cql2elm/PathAware.kt | 0 .../cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt | 0 .../org/cqframework/cql/cql2elm/ResultWithPossibleError.kt | 0 .../org/cqframework/cql/cql2elm/StringEscapeUtils.kt | 0 .../cqframework/cql/cql2elm/StringLibrarySourceProvider.kt | 0 .../org/cqframework/cql/cql2elm/SystemFunctionResolver.kt | 0 .../org/cqframework/cql/cql2elm/SystemMethodResolver.kt | 0 .../org/cqframework/cql/cql2elm/TypeBuilder.kt | 0 .../org/cqframework/cql/cql2elm/elm/ElmEdit.kt | 0 .../org/cqframework/cql/cql2elm/elm/ElmEditor.kt | 0 .../org/cqframework/cql/cql2elm/elm/IElmEdit.kt | 0 .../org/cqframework/cql/cql2elm/model/CallContext.kt | 0 .../org/cqframework/cql/cql2elm/model/Chunk.kt | 0 .../org/cqframework/cql/cql2elm/model/CompiledLibrary.kt | 0 .../org/cqframework/cql/cql2elm/model/Conversion.kt | 0 .../org/cqframework/cql/cql2elm/model/ConversionMap.kt | 0 .../org/cqframework/cql/cql2elm/model/FunctionHeader.kt | 0 .../org/cqframework/cql/cql2elm/model/GenericOperator.kt | 0 .../cql/cql2elm/model/InstantiationContextImpl.kt | 0 .../org/cqframework/cql/cql2elm/model/InstantiationResult.kt | 0 .../org/cqframework/cql/cql2elm/model/Invocation.kt | 0 .../org/cqframework/cql/cql2elm/model/LibraryRef.kt | 0 .../org/cqframework/cql/cql2elm/model/Model.kt | 0 .../org/cqframework/cql/cql2elm/model/ModelImporter.kt | 0 .../org/cqframework/cql/cql2elm/model/Operator.kt | 0 .../org/cqframework/cql/cql2elm/model/OperatorEntry.kt | 0 .../org/cqframework/cql/cql2elm/model/OperatorMap.kt | 0 .../org/cqframework/cql/cql2elm/model/OperatorResolution.kt | 0 .../org/cqframework/cql/cql2elm/model/PropertyResolution.kt | 0 .../org/cqframework/cql/cql2elm/model/QueryContext.kt | 0 .../cql/cql2elm/model/ResolvedIdentifierContext.kt | 0 .../org/cqframework/cql/cql2elm/model/Signature.kt | 0 .../org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt | 0 .../org/cqframework/cql/cql2elm/model/SystemModel.kt | 0 .../cqframework/cql/cql2elm/model/TimingOperatorContext.kt | 0 .../org/cqframework/cql/cql2elm/model/Version.kt | 0 .../cql2elm/model/invocation/AbstractExpressionInvocation.kt | 0 .../model/invocation/AggregateExpressionInvocation.kt | 0 .../cql2elm/model/invocation/AnyInCodeSystemInvocation.kt | 0 .../cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt | 0 .../cql2elm/model/invocation/BinaryExpressionInvocation.kt | 0 .../cql/cql2elm/model/invocation/CombineInvocation.kt | 0 .../cql/cql2elm/model/invocation/ConvertInvocation.kt | 0 .../cql/cql2elm/model/invocation/DateInvocation.kt | 0 .../cql/cql2elm/model/invocation/DateTimeInvocation.kt | 0 .../cql/cql2elm/model/invocation/FirstInvocation.kt | 0 .../cql/cql2elm/model/invocation/FunctionRefInvocation.kt | 0 .../cql/cql2elm/model/invocation/InCodeSystemInvocation.kt | 0 .../cql/cql2elm/model/invocation/InValueSetInvocation.kt | 0 .../cql/cql2elm/model/invocation/IndexOfInvocation.kt | 0 .../cql/cql2elm/model/invocation/LastInvocation.kt | 0 .../cql/cql2elm/model/invocation/LastPositionOfInvocation.kt | 0 .../cql/cql2elm/model/invocation/MessageInvocation.kt | 0 .../cql/cql2elm/model/invocation/NaryExpressionInvocation.kt | 0 .../cql2elm/model/invocation/OperatorExpressionInvocation.kt | 0 .../cql/cql2elm/model/invocation/PositionOfInvocation.kt | 0 .../cql/cql2elm/model/invocation/RoundInvocation.kt | 0 .../cql/cql2elm/model/invocation/SkipInvocation.kt | 0 .../cql/cql2elm/model/invocation/SplitInvocation.kt | 0 .../cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt | 0 .../cql/cql2elm/model/invocation/SubstringInvocation.kt | 0 .../cql/cql2elm/model/invocation/TailInvocation.kt | 0 .../cql/cql2elm/model/invocation/TakeInvocation.kt | 0 .../cql2elm/model/invocation/TernaryExpressionInvocation.kt | 0 .../cql/cql2elm/model/invocation/TimeInvocation.kt | 0 .../cql2elm/model/invocation/UnaryExpressionInvocation.kt | 0 .../model/invocation/ZeroOperandExpressionInvocation.kt | 0 .../org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt | 0 .../cql/cql2elm/preprocessor/CodeDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/ContextDefinitionInfo.kt | 0 .../cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt | 0 .../cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt | 0 .../cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt | 0 .../org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt | 0 .../cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/UsingDefinitionInfo.kt | 0 .../cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt | 0 .../org/cqframework/cql/cql2elm/tracking/TrackBack.kt | 0 .../org/cqframework/cql/cql2elm/tracking/Trackable.kt | 0 .../cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt | 5 ++--- .../org/cqframework/cql/cql2elm/ucum/UcumService.kt | 0 .../org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt | 0 .../{java => kotlin}/org/cqframework/cql/Application.kt | 0 .../org/cqframework/cql/elm/IdObjectFactory.kt | 0 .../org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt | 0 .../org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt | 0 .../org/cqframework/cql/elm/serializing/ElmLibraryReader.kt | 0 .../cql/elm/serializing/ElmLibraryReaderFactory.kt | 0 .../cql/elm/serializing/ElmLibraryReaderProvider.kt | 0 .../org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt | 0 .../cql/elm/serializing/ElmLibraryWriterFactory.kt | 0 .../cql/elm/serializing/ElmLibraryWriterProvider.kt | 0 .../org/cqframework/cql/elm/serializing/LibraryWrapper.kt | 0 .../org/cqframework/cql/elm/utility/Visitors.kt | 0 .../cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt | 0 .../cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt | 0 .../org/cqframework/cql/elm/visiting/BaseElmVisitor.kt | 0 .../org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt | 0 .../org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt | 0 .../org/cqframework/cql/elm/visiting/ElmVisitor.kt | 0 .../org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt | 0 .../org/hl7/cql_annotations/r1/package-info.java | 0 .../main/{java => kotlin}/org/hl7/elm/r1/package-info.java | 0 .../main/{java => kotlin}/org/hl7/cql/model/BaseDataType.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/ChoiceType.kt | 0 .../src/main/{java => kotlin}/org/hl7/cql/model/ClassType.kt | 0 .../{java => kotlin}/org/hl7/cql/model/ClassTypeElement.kt | 0 .../src/main/{java => kotlin}/org/hl7/cql/model/DataType.kt | 0 .../org/hl7/cql/model/GenericClassSignatureParser.kt | 0 .../org/hl7/cql/model/InstantiationContext.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/IntervalType.kt | 0 .../org/hl7/cql/model/InvalidRedeclarationException.kt | 0 .../src/main/{java => kotlin}/org/hl7/cql/model/ListType.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/ModelContext.kt | 0 .../{java => kotlin}/org/hl7/cql/model/ModelIdentifier.kt | 0 .../{java => kotlin}/org/hl7/cql/model/ModelInfoProvider.kt | 0 .../src/main/{java => kotlin}/org/hl7/cql/model/NamedType.kt | 0 .../{java => kotlin}/org/hl7/cql/model/NamespaceAware.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/NamespaceInfo.kt | 0 .../{java => kotlin}/org/hl7/cql/model/NamespaceManager.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/ProfileType.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/Relationship.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/SearchType.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/SimpleType.kt | 0 .../org/hl7/cql/model/SystemModelInfoProvider.kt | 0 .../src/main/{java => kotlin}/org/hl7/cql/model/TupleType.kt | 0 .../{java => kotlin}/org/hl7/cql/model/TupleTypeElement.kt | 0 .../main/{java => kotlin}/org/hl7/cql/model/TypeParameter.kt | 0 .../org/hl7/elm_modelinfo/r1/package-info.java | 0 .../org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt | 0 .../elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt | 0 .../elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt | 0 165 files changed, 2 insertions(+), 3 deletions(-) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CompilerOptions.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlCapability.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlCompiler.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlCompilerException.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlCompilerOptions.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlIncludeException.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlInternalException.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlSemanticException.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlSyntaxException.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlTranslator.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/DataTypes.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/IdentifierContext.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibraryBuilder.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibraryContentType.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibraryManager.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibraryReaderUtil.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibrarySourceLoader.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibrarySourceProvider.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/MimeType.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ModelInfoLoader.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ModelManager.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ModelResolver.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/PathAware.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ResultWithPossibleError.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/StringEscapeUtils.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/StringLibrarySourceProvider.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/SystemFunctionResolver.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/SystemMethodResolver.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/TypeBuilder.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/elm/ElmEdit.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/elm/ElmEditor.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/elm/IElmEdit.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/CallContext.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Chunk.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/CompiledLibrary.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Conversion.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/ConversionMap.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/FunctionHeader.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/GenericOperator.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/InstantiationContextImpl.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/InstantiationResult.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Invocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/LibraryRef.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Model.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/ModelImporter.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Operator.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/OperatorEntry.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/OperatorMap.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/OperatorResolution.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/PropertyResolution.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/QueryContext.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/ResolvedIdentifierContext.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Signature.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/SystemModel.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/TimingOperatorContext.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/Version.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/AbstractExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/AggregateExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/AnyInCodeSystemInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/BinaryExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/CombineInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/ConvertInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/DateInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/DateTimeInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/FirstInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/FunctionRefInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/InCodeSystemInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/InValueSetInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/IndexOfInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/LastInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/LastPositionOfInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/MessageInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/NaryExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/OperatorExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/PositionOfInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/RoundInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/SkipInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/SplitInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/SubstringInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/TailInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/TakeInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/TernaryExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/TimeInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/UnaryExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/model/invocation/ZeroOperandExpressionInvocation.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/CodeDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/ContextDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/UsingDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/tracking/TrackBack.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/tracking/Trackable.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt (92%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ucum/UcumService.kt (100%) rename Src/java/cql-to-elm/src/main/{java => kotlin}/org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt (100%) rename Src/java/cql/src/jvmMain/{java => kotlin}/org/cqframework/cql/Application.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/IdObjectFactory.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryReader.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryReaderFactory.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryReaderProvider.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryWriterFactory.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/ElmLibraryWriterProvider.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/serializing/LibraryWrapper.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/utility/Visitors.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/BaseElmVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/ElmVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt (100%) rename Src/java/elm/src/main/{java => kotlin}/org/hl7/cql_annotations/r1/package-info.java (100%) rename Src/java/elm/src/main/{java => kotlin}/org/hl7/elm/r1/package-info.java (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/BaseDataType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ChoiceType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ClassType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ClassTypeElement.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/DataType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/GenericClassSignatureParser.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/InstantiationContext.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/IntervalType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/InvalidRedeclarationException.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ListType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ModelContext.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ModelIdentifier.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ModelInfoProvider.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/NamedType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/NamespaceAware.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/NamespaceInfo.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/NamespaceManager.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/ProfileType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/Relationship.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/SearchType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/SimpleType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/SystemModelInfoProvider.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/TupleType.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/TupleTypeElement.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/cql/model/TypeParameter.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/elm_modelinfo/r1/package-info.java (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt (100%) rename Src/java/model/src/main/{java => kotlin}/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt (100%) diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CompilerOptions.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CompilerOptions.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CompilerOptions.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CompilerOptions.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCapability.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCapability.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCapability.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCapability.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompiler.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompiler.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompiler.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompiler.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompilerException.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompilerException.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompilerException.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompilerException.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompilerOptions.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompilerOptions.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlCompilerOptions.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlCompilerOptions.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlIncludeException.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlIncludeException.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlIncludeException.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlIncludeException.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlInternalException.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlInternalException.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlInternalException.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlInternalException.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlSemanticException.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlSemanticException.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlSemanticException.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlSemanticException.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlSyntaxException.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlSyntaxException.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlSyntaxException.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlSyntaxException.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlTranslator.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlTranslator.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlTranslator.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlTranslator.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CqlTranslatorOptions.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DataTypes.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DataTypes.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DataTypes.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DataTypes.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultLibrarySourceLoader.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultLibrarySourceProvider.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/DefaultModelInfoProvider.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/IdentifierContext.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/IdentifierContext.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/IdentifierContext.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/IdentifierContext.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryBuilder.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryBuilder.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryBuilder.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryBuilder.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryContentType.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryContentType.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryContentType.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryContentType.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryManager.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryManager.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryManager.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryManager.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryReaderUtil.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryReaderUtil.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryReaderUtil.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibraryReaderUtil.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceLoader.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceLoader.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceLoader.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceLoader.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceProvider.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceProvider.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceProvider.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceProvider.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/LibrarySourceProviderFactory.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/MimeType.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/MimeType.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/MimeType.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/MimeType.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelInfoLoader.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelInfoLoader.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelInfoLoader.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelInfoLoader.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelInfoProviderFactory.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelManager.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelManager.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelManager.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelManager.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelResolver.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelResolver.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelResolver.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ModelResolver.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/PathAware.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/PathAware.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/PathAware.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/PathAware.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/PriorityLibrarySourceLoader.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ResultWithPossibleError.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ResultWithPossibleError.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ResultWithPossibleError.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ResultWithPossibleError.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/StringEscapeUtils.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/StringEscapeUtils.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/StringEscapeUtils.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/StringEscapeUtils.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/StringLibrarySourceProvider.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/StringLibrarySourceProvider.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/StringLibrarySourceProvider.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/StringLibrarySourceProvider.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/SystemFunctionResolver.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/SystemFunctionResolver.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/SystemFunctionResolver.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/SystemFunctionResolver.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/SystemMethodResolver.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/SystemMethodResolver.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/SystemMethodResolver.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/SystemMethodResolver.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/TypeBuilder.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/TypeBuilder.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/TypeBuilder.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/TypeBuilder.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/ElmEdit.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/ElmEdit.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/ElmEdit.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/ElmEdit.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/ElmEditor.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/ElmEditor.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/ElmEditor.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/ElmEditor.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/IElmEdit.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/IElmEdit.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/elm/IElmEdit.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/elm/IElmEdit.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/CallContext.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/CallContext.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/CallContext.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/CallContext.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Chunk.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Chunk.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Chunk.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Chunk.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/CompiledLibrary.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/CompiledLibrary.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/CompiledLibrary.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/CompiledLibrary.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Conversion.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Conversion.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Conversion.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Conversion.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ConversionMap.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ConversionMap.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ConversionMap.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ConversionMap.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/FunctionHeader.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/FunctionHeader.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/FunctionHeader.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/FunctionHeader.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/GenericOperator.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/GenericOperator.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/GenericOperator.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/GenericOperator.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/InstantiationContextImpl.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/InstantiationContextImpl.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/InstantiationContextImpl.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/InstantiationContextImpl.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/InstantiationResult.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/InstantiationResult.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/InstantiationResult.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/InstantiationResult.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Invocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Invocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Invocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Invocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/LibraryRef.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/LibraryRef.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/LibraryRef.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/LibraryRef.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Model.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Model.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Model.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Model.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ModelImporter.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ModelImporter.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ModelImporter.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ModelImporter.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Operator.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Operator.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Operator.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Operator.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorEntry.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorEntry.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorEntry.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorEntry.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorMap.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorMap.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorMap.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorMap.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorResolution.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorResolution.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorResolution.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/OperatorResolution.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/PropertyResolution.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/PropertyResolution.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/PropertyResolution.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/PropertyResolution.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/QueryContext.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/QueryContext.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/QueryContext.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/QueryContext.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ResolvedIdentifierContext.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ResolvedIdentifierContext.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/ResolvedIdentifierContext.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/ResolvedIdentifierContext.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Signature.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Signature.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Signature.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Signature.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/SystemLibraryHelper.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/SystemModel.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/SystemModel.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/SystemModel.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/SystemModel.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/TimingOperatorContext.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/TimingOperatorContext.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/TimingOperatorContext.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/TimingOperatorContext.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Version.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Version.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Version.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/Version.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AbstractExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AbstractExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AbstractExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AbstractExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AggregateExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AggregateExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AggregateExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AggregateExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AnyInCodeSystemInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AnyInCodeSystemInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AnyInCodeSystemInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AnyInCodeSystemInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/AnyInValueSetInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/BinaryExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/BinaryExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/BinaryExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/BinaryExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/CombineInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/CombineInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/CombineInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/CombineInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/ConvertInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/ConvertInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/ConvertInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/ConvertInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/DateInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/DateInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/DateInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/DateInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/DateTimeInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/DateTimeInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/DateTimeInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/DateTimeInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/FirstInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/FirstInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/FirstInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/FirstInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/FunctionRefInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/FunctionRefInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/FunctionRefInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/FunctionRefInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/InCodeSystemInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/InCodeSystemInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/InCodeSystemInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/InCodeSystemInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/InValueSetInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/InValueSetInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/InValueSetInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/InValueSetInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/IndexOfInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/IndexOfInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/IndexOfInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/IndexOfInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/LastInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/LastInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/LastInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/LastInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/LastPositionOfInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/LastPositionOfInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/LastPositionOfInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/LastPositionOfInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/MessageInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/MessageInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/MessageInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/MessageInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/NaryExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/NaryExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/NaryExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/NaryExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/OperatorExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/OperatorExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/OperatorExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/OperatorExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/PositionOfInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/PositionOfInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/PositionOfInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/PositionOfInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/RoundInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/RoundInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/RoundInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/RoundInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SkipInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SkipInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SkipInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SkipInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SplitInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SplitInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SplitInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SplitInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SplitOnMatchesInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SubstringInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SubstringInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/SubstringInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/SubstringInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TailInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TailInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TailInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TailInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TakeInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TakeInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TakeInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TakeInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TernaryExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TernaryExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TernaryExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TernaryExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TimeInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TimeInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/TimeInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/TimeInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/UnaryExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/UnaryExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/UnaryExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/UnaryExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/ZeroOperandExpressionInvocation.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/ZeroOperandExpressionInvocation.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/invocation/ZeroOperandExpressionInvocation.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/model/invocation/ZeroOperandExpressionInvocation.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/BaseInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CodeDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CodeDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CodeDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CodeDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CodesystemDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ConceptDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ContextDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ContextDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ContextDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ContextDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessor.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ExpressionDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/FunctionDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/IncludeDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/LibraryInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ParameterDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/UsingDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/UsingDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/UsingDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/UsingDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/preprocessor/ValuesetDefinitionInfo.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/TrackBack.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/TrackBack.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/TrackBack.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/TrackBack.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/Trackable.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/Trackable.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/Trackable.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/Trackable.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt similarity index 92% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt index f08bb2704..67965a920 100644 --- a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt +++ b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/tracking/WeakIdentityHashMap.kt @@ -1,9 +1,8 @@ package org.cqframework.cql.cql2elm.tracking import java.lang.ref.WeakReference -import java.util.concurrent.ConcurrentHashMap -const val DEFAULT_CLEANUP_THRESHOLD = 1000 +const val DEFAULT_CLEANUP_THRESHOLD = 10000 /** * This is a map that uses weak references for keys. This means that if the key is no longer @@ -13,7 +12,7 @@ const val DEFAULT_CLEANUP_THRESHOLD = 1000 */ internal class WeakIdentityHashMap { - private val backingMap = ConcurrentHashMap, V>() + private val backingMap = HashMap, V>() private var operationCount = 0 private val cleanupThreshold = DEFAULT_CLEANUP_THRESHOLD diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ucum/UcumService.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ucum/UcumService.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ucum/UcumService.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ucum/UcumService.kt diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt similarity index 100% rename from Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt rename to Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/ucum/UcumServiceFactory.kt diff --git a/Src/java/cql/src/jvmMain/java/org/cqframework/cql/Application.kt b/Src/java/cql/src/jvmMain/kotlin/org/cqframework/cql/Application.kt similarity index 100% rename from Src/java/cql/src/jvmMain/java/org/cqframework/cql/Application.kt rename to Src/java/cql/src/jvmMain/kotlin/org/cqframework/cql/Application.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/IdObjectFactory.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/IdObjectFactory.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/IdObjectFactory.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/IdObjectFactory.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/evaluating/SimpleElmEngine.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/evaluating/SimpleElmEvaluator.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReader.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReader.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReader.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReader.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReaderFactory.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReaderFactory.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReaderFactory.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReaderFactory.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReaderProvider.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReaderProvider.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryReaderProvider.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryReaderProvider.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriter.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriterFactory.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriterFactory.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriterFactory.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriterFactory.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriterProvider.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriterProvider.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/ElmLibraryWriterProvider.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/ElmLibraryWriterProvider.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/LibraryWrapper.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/LibraryWrapper.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/serializing/LibraryWrapper.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/serializing/LibraryWrapper.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/utility/Visitors.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/utility/Visitors.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/utility/Visitors.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/utility/Visitors.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmClinicalVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmLibraryVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/BaseElmVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/BaseElmVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmClinicalVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmLibraryVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/ElmVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/ElmVisitor.kt diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt b/Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt similarity index 100% rename from Src/java/elm/src/main/java/org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt rename to Src/java/elm/src/main/kotlin/org/cqframework/cql/elm/visiting/FunctionalElmVisitor.kt diff --git a/Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java b/Src/java/elm/src/main/kotlin/org/hl7/cql_annotations/r1/package-info.java similarity index 100% rename from Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java rename to Src/java/elm/src/main/kotlin/org/hl7/cql_annotations/r1/package-info.java diff --git a/Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java b/Src/java/elm/src/main/kotlin/org/hl7/elm/r1/package-info.java similarity index 100% rename from Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java rename to Src/java/elm/src/main/kotlin/org/hl7/elm/r1/package-info.java diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/BaseDataType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/BaseDataType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/BaseDataType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/BaseDataType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ChoiceType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ChoiceType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ChoiceType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ChoiceType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ClassType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ClassType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ClassType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ClassType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ClassTypeElement.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ClassTypeElement.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ClassTypeElement.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ClassTypeElement.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/DataType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/DataType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/DataType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/DataType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/GenericClassSignatureParser.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/GenericClassSignatureParser.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/GenericClassSignatureParser.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/GenericClassSignatureParser.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/InstantiationContext.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/InstantiationContext.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/InstantiationContext.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/InstantiationContext.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/IntervalType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/IntervalType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/IntervalType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/IntervalType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/InvalidRedeclarationException.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/InvalidRedeclarationException.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/InvalidRedeclarationException.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/InvalidRedeclarationException.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ListType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ListType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ListType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ListType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ModelContext.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelContext.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ModelContext.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelContext.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelIdentifier.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelIdentifier.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ModelInfoProvider.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelInfoProvider.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ModelInfoProvider.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ModelInfoProvider.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/NamedType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/NamedType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/NamedType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/NamedType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/NamespaceAware.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceAware.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/NamespaceAware.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceAware.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/NamespaceInfo.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceInfo.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/NamespaceInfo.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceInfo.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/NamespaceManager.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceManager.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/NamespaceManager.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/NamespaceManager.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ProfileType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/ProfileType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/ProfileType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/ProfileType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/Relationship.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/Relationship.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/Relationship.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/Relationship.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/SearchType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/SearchType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/SearchType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/SearchType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/SimpleType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/SimpleType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/SimpleType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/SimpleType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/SystemModelInfoProvider.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/SystemModelInfoProvider.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/SystemModelInfoProvider.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/SystemModelInfoProvider.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/TupleType.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/TupleType.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/TupleType.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/TupleType.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/TupleTypeElement.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/TupleTypeElement.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/TupleTypeElement.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/TupleTypeElement.kt diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/TypeParameter.kt b/Src/java/model/src/main/kotlin/org/hl7/cql/model/TypeParameter.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/cql/model/TypeParameter.kt rename to Src/java/model/src/main/kotlin/org/hl7/cql/model/TypeParameter.kt diff --git a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java b/Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/package-info.java similarity index 100% rename from Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java rename to Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/package-info.java diff --git a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt b/Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt rename to Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReader.kt diff --git a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt b/Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt rename to Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt diff --git a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt b/Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt similarity index 100% rename from Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt rename to Src/java/model/src/main/kotlin/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderProvider.kt