From 7ebae356de5d1102a96c893b2ca01862f5852c5e Mon Sep 17 00:00:00 2001 From: Stephan Klevenz Date: Mon, 10 Mar 2014 09:36:58 +0100 Subject: [PATCH] [OLINGO-192] rename modules --- {odata4-fit => fit}/pom.xml | 0 .../odata4-client-api => lib/client-api}/pom.xml | 0 .../olingo/odata4/client/api/Configuration.java | 0 .../apache/olingo/odata4/client/api/Constants.java | 0 .../olingo/odata4/client/api/ODataClient.java | 0 .../olingo/odata4/client/api/ODataConstants.java | 0 .../olingo/odata4/client/api/ODataError.java | 0 .../olingo/odata4/client/api/ODataV3Client.java | 0 .../olingo/odata4/client/api/ODataV4Client.java | 0 .../client/api/UnsupportedInV3Exception.java | 0 .../olingo/odata4/client/api/V3Configuration.java | 0 .../olingo/odata4/client/api/V4Configuration.java | 0 .../odata4/client/api/data/ServiceDocument.java | 0 .../client/api/data/ServiceDocumentItem.java | 0 .../api/deserializer/AnnotationProperty.java | 0 .../client/api/deserializer/ClientException.java | 0 .../client/api/deserializer/ComplexValue.java | 0 .../odata4/client/api/deserializer/Entity.java | 0 .../odata4/client/api/deserializer/EntitySet.java | 0 .../api/deserializer/NavigationProperty.java | 0 .../odata4/client/api/deserializer/Property.java | 0 .../odata4/client/api/deserializer/Reader.java | 0 .../api/deserializer/StructuralProperty.java | 0 .../odata4/client/api/deserializer/Value.java | 0 .../odata4/client/api/domain/EdmSimpleType.java | 0 .../client/api/domain/ODataCollectionValue.java | 0 .../client/api/domain/ODataComplexValue.java | 0 .../odata4/client/api/domain/ODataDuration.java | 0 .../client/api/domain/ODataGeospatialValue.java | 0 .../client/api/domain/ODataInvokeResult.java | 0 .../client/api/domain/ODataPrimitiveValue.java | 0 .../odata4/client/api/domain/ODataProperty.java | 0 .../client/api/domain/ODataServiceDocument.java | 0 .../odata4/client/api/domain/ODataTimestamp.java | 0 .../odata4/client/api/domain/ODataValue.java | 0 .../api/domain/geospatial/ComposedGeospatial.java | 0 .../client/api/domain/geospatial/Geospatial.java | 0 .../domain/geospatial/GeospatialCollection.java | 0 .../client/api/domain/geospatial/LineString.java | 0 .../api/domain/geospatial/MultiLineString.java | 0 .../client/api/domain/geospatial/MultiPoint.java | 0 .../client/api/domain/geospatial/MultiPolygon.java | 0 .../odata4/client/api/domain/geospatial/Point.java | 0 .../client/api/domain/geospatial/Polygon.java | 0 .../client/api/edm/xml/CommonAnnotations.java | 0 .../client/api/edm/xml/CommonFunctionImport.java | 0 .../api/edm/xml/CommonNavigationProperty.java | 0 .../odata4/client/api/edm/xml/CommonParameter.java | 0 .../odata4/client/api/edm/xml/CommonProperty.java | 0 .../odata4/client/api/edm/xml/ComplexType.java | 0 .../odata4/client/api/edm/xml/DataServices.java | 0 .../olingo/odata4/client/api/edm/xml/Edmx.java | 0 .../odata4/client/api/edm/xml/EntityContainer.java | 0 .../odata4/client/api/edm/xml/EntityKey.java | 0 .../odata4/client/api/edm/xml/EntitySet.java | 0 .../odata4/client/api/edm/xml/EntityType.java | 0 .../olingo/odata4/client/api/edm/xml/EnumType.java | 0 .../olingo/odata4/client/api/edm/xml/Member.java | 0 .../olingo/odata4/client/api/edm/xml/Named.java | 0 .../olingo/odata4/client/api/edm/xml/OnDelete.java | 0 .../odata4/client/api/edm/xml/OnDeleteAction.java | 0 .../odata4/client/api/edm/xml/PropertyRef.java | 0 .../olingo/odata4/client/api/edm/xml/Schema.java | 0 .../odata4/client/api/edm/xml/XMLMetadata.java | 0 .../odata4/client/api/edm/xml/v3/Annotations.java | 0 .../odata4/client/api/edm/xml/v3/Association.java | 0 .../client/api/edm/xml/v3/AssociationEnd.java | 0 .../client/api/edm/xml/v3/AssociationSet.java | 0 .../client/api/edm/xml/v3/AssociationSetEnd.java | 0 .../client/api/edm/xml/v3/FunctionImport.java | 0 .../client/api/edm/xml/v3/NavigationProperty.java | 0 .../odata4/client/api/edm/xml/v3/Parameter.java | 0 .../client/api/edm/xml/v3/ParameterMode.java | 0 .../odata4/client/api/edm/xml/v3/Property.java | 0 .../client/api/edm/xml/v3/PropertyValue.java | 0 .../api/edm/xml/v3/ReferentialConstraint.java | 0 .../api/edm/xml/v3/ReferentialConstraintRole.java | 0 .../client/api/edm/xml/v3/TypeAnnotation.java | 0 .../olingo/odata4/client/api/edm/xml/v3/Using.java | 0 .../client/api/edm/xml/v3/ValueAnnotation.java | 0 .../odata4/client/api/edm/xml/v3/ValueTerm.java | 0 .../odata4/client/api/edm/xml/v4/Action.java | 0 .../odata4/client/api/edm/xml/v4/ActionImport.java | 0 .../client/api/edm/xml/v4/AnnotatedEdmItem.java | 0 .../odata4/client/api/edm/xml/v4/Annotation.java | 0 .../odata4/client/api/edm/xml/v4/Annotations.java | 0 .../client/api/edm/xml/v4/BindingTarget.java | 0 .../odata4/client/api/edm/xml/v4/CSDLElement.java | 0 .../odata4/client/api/edm/xml/v4/ComplexType.java | 0 .../olingo/odata4/client/api/edm/xml/v4/Edmx.java | 0 .../client/api/edm/xml/v4/EntityContainer.java | 0 .../odata4/client/api/edm/xml/v4/EntitySet.java | 0 .../odata4/client/api/edm/xml/v4/EntityType.java | 0 .../odata4/client/api/edm/xml/v4/Function.java | 0 .../client/api/edm/xml/v4/FunctionImport.java | 0 .../odata4/client/api/edm/xml/v4/Include.java | 0 .../client/api/edm/xml/v4/IncludeAnnotations.java | 0 .../client/api/edm/xml/v4/NavigationProperty.java | 0 .../api/edm/xml/v4/NavigationPropertyBinding.java | 0 .../client/api/edm/xml/v4/OperationImport.java | 0 .../odata4/client/api/edm/xml/v4/Parameter.java | 0 .../odata4/client/api/edm/xml/v4/Property.java | 0 .../odata4/client/api/edm/xml/v4/Reference.java | 0 .../api/edm/xml/v4/ReferentialConstraint.java | 0 .../odata4/client/api/edm/xml/v4/ReturnType.java | 0 .../odata4/client/api/edm/xml/v4/Schema.java | 0 .../odata4/client/api/edm/xml/v4/Singleton.java | 0 .../olingo/odata4/client/api/edm/xml/v4/Term.java | 0 .../client/api/edm/xml/v4/TypeDefinition.java | 0 .../odata4/client/api/edm/xml/v4/XMLMetadata.java | 0 .../edm/xml/v4/annotation/ConstExprConstruct.java | 0 .../edm/xml/v4/annotation/DynExprConstruct.java | 0 .../api/edm/xml/v4/annotation/ExprConstruct.java | 0 .../odata4/client/api/format/ODataFormat.java | 0 .../odata4/client/api/format/ODataMediaFormat.java | 0 .../odata4/client/api/format/ODataPubFormat.java | 0 .../odata4/client/api/format/ODataValueFormat.java | 0 .../client/api/http/HttpClientException.java | 0 .../odata4/client/api/http/HttpClientFactory.java | 0 .../olingo/odata4/client/api/http/HttpMethod.java | 0 .../client/api/http/HttpUriRequestFactory.java | 0 .../odata4/client/api/http/NoContentException.java | 0 .../olingo/odata4/client/api/op/ODataBinder.java | 0 .../odata4/client/api/op/ODataDeserializer.java | 0 .../olingo/odata4/client/api/op/ODataReader.java | 0 .../odata4/client/api/op/ODataSerializer.java | 0 .../odata4/client/api/op/ODataV3Deserializer.java | 0 .../odata4/client/api/op/ODataV4Deserializer.java | 0 .../olingo/odata4/client/api/uri/QueryOption.java | 0 .../olingo/odata4/client/api/uri/SegmentType.java | 0 .../olingo/odata4/client/api/uri/URIBuilder.java | 0 .../olingo/odata4/client/api/uri/V3URIBuilder.java | 0 .../olingo/odata4/client/api/uri/V4URIBuilder.java | 0 .../odata4/client/api/uri/filter/FilterArg.java | 0 .../client/api/uri/filter/FilterArgFactory.java | 0 .../client/api/uri/filter/FilterFactory.java | 0 .../odata4/client/api/uri/filter/URIFilter.java | 0 .../client/api/uri/filter/V3FilterArgFactory.java | 0 .../client/api/uri/filter/V3FilterFactory.java | 0 .../client/api/uri/filter/V4FilterArgFactory.java | 0 .../client/api/uri/filter/V4FilterFactory.java | 0 .../odata4/client/api/utils/EdmTypeInfo.java | 0 .../olingo/odata4/client/api/utils/XMLUtils.java | 0 .../odata4-client-core => lib/client-core}/pom.xml | 0 .../odata4/client/core/AbstractConfiguration.java | 0 .../odata4/client/core/AbstractODataClient.java | 0 .../odata4/client/core/ODataClientFactory.java | 0 .../odata4/client/core/ODataV3ClientImpl.java | 0 .../odata4/client/core/ODataV4ClientImpl.java | 0 .../odata4/client/core/V3ConfigurationImpl.java | 0 .../odata4/client/core/V4ConfigurationImpl.java | 0 .../client/core/data/AbstractServiceDocument.java | 0 .../core/data/JSONServiceDocumentDeserializer.java | 0 .../client/core/data/ODataJacksonDeserializer.java | 0 .../client/core/data/ODataJacksonSerializer.java | 0 .../client/core/data/ServiceDocumentItemImpl.java | 0 .../core/data/XMLServiceDocumentDeserializer.java | 0 .../core/data/v3/JSONServiceDocumentImpl.java | 0 .../core/data/v3/XMLServiceDocumentImpl.java | 0 .../core/data/v4/AbstractServiceDocument.java | 0 .../core/data/v4/JSONServiceDocumentImpl.java | 0 .../core/data/v4/XMLServiceDocumentImpl.java | 0 .../core/deserializer/AnnotationPropertyImpl.java | 0 .../client/core/deserializer/ComplexValueImpl.java | 0 .../client/core/deserializer/EntityImpl.java | 0 .../client/core/deserializer/EntitySetBuilder.java | 0 .../client/core/deserializer/EntitySetImpl.java | 0 .../client/core/deserializer/JsonReader.java | 0 .../core/deserializer/NavigationPropertyImpl.java | 0 .../client/core/deserializer/PrimitiveValue.java | 0 .../core/deserializer/PropertyCollection.java | 0 .../deserializer/PropertyCollectionBuilder.java | 0 .../core/deserializer/StructuralPropertyImpl.java | 0 .../core/edm/AbstractEdmServiceMetadataImpl.java | 0 .../odata4/client/core/edm/EdmActionImpl.java | 0 .../client/core/edm/EdmActionImportImpl.java | 0 .../client/core/edm/EdmBindingTargetImpl.java | 0 .../odata4/client/core/edm/EdmClientImpl.java | 0 .../odata4/client/core/edm/EdmComplexTypeImpl.java | 0 .../client/core/edm/EdmEntityContainerImpl.java | 0 .../odata4/client/core/edm/EdmEntitySetImpl.java | 0 .../odata4/client/core/edm/EdmEntityTypeImpl.java | 0 .../odata4/client/core/edm/EdmEnumTypeImpl.java | 0 .../odata4/client/core/edm/EdmFunctionImpl.java | 0 .../client/core/edm/EdmFunctionImportImpl.java | 0 .../client/core/edm/EdmKeyPropertyRefImpl.java | 0 .../client/core/edm/EdmNavigationPropertyImpl.java | 0 .../odata4/client/core/edm/EdmOperationImpl.java | 0 .../client/core/edm/EdmOperationImportImpl.java | 0 .../odata4/client/core/edm/EdmParameterImpl.java | 0 .../odata4/client/core/edm/EdmPropertyImpl.java | 0 .../odata4/client/core/edm/EdmReturnTypeImpl.java | 0 .../odata4/client/core/edm/EdmSingletonImpl.java | 0 .../core/edm/EdmStructuredTypeHelperImpl.java | 0 .../client/core/edm/EdmTypeDefinitionImpl.java | 0 .../client/core/edm/v3/EdmActionImportProxy.java | 0 .../odata4/client/core/edm/v3/EdmActionProxy.java | 0 .../client/core/edm/v3/EdmEntitySetProxy.java | 0 .../client/core/edm/v3/EdmFunctionImportProxy.java | 0 .../client/core/edm/v3/EdmFunctionProxy.java | 0 .../client/core/edm/v3/EdmOperationProxy.java | 0 .../client/core/edm/v3/EdmServiceMetadataImpl.java | 0 .../odata4/client/core/edm/v3/ReturnTypeProxy.java | 0 .../client/core/edm/v3/V3FunctionImportUtils.java | 0 .../client/core/edm/v4/EdmServiceMetadataImpl.java | 0 .../client/core/edm/xml/AbstractAnnotations.java | 0 .../client/core/edm/xml/AbstractComplexType.java | 0 .../client/core/edm/xml/AbstractDataServices.java | 0 .../client/core/edm/xml/AbstractEdmItem.java | 0 .../odata4/client/core/edm/xml/AbstractEdmx.java | 0 .../core/edm/xml/AbstractEntityContainer.java | 0 .../client/core/edm/xml/AbstractEntitySet.java | 0 .../client/core/edm/xml/AbstractEntityType.java | 0 .../client/core/edm/xml/AbstractEnumType.java | 0 .../odata4/client/core/edm/xml/AbstractMember.java | 0 .../core/edm/xml/AbstractNavigationProperty.java | 0 .../client/core/edm/xml/AbstractParameter.java | 0 .../client/core/edm/xml/AbstractProperty.java | 0 .../odata4/client/core/edm/xml/AbstractSchema.java | 0 .../client/core/edm/xml/AbstractXMLMetadata.java | 0 .../core/edm/xml/DataServicesDeserializer.java | 0 .../client/core/edm/xml/EdmxDeserializer.java | 0 .../odata4/client/core/edm/xml/EntityKeyImpl.java | 0 .../odata4/client/core/edm/xml/OnDeleteImpl.java | 0 .../client/core/edm/xml/ParameterDeserializer.java | 0 .../client/core/edm/xml/PropertyDeserializer.java | 0 .../client/core/edm/xml/PropertyRefImpl.java | 0 .../core/edm/xml/v3/AnnotationsDeserializer.java | 0 .../client/core/edm/xml/v3/AnnotationsImpl.java | 0 .../core/edm/xml/v3/AssociationDeserializer.java | 0 .../client/core/edm/xml/v3/AssociationEndImpl.java | 0 .../client/core/edm/xml/v3/AssociationImpl.java | 0 .../edm/xml/v3/AssociationSetDeserializer.java | 0 .../core/edm/xml/v3/AssociationSetEndImpl.java | 0 .../client/core/edm/xml/v3/AssociationSetImpl.java | 0 .../client/core/edm/xml/v3/ComplexTypeImpl.java | 0 .../client/core/edm/xml/v3/DataServicesImpl.java | 0 .../odata4/client/core/edm/xml/v3/EdmxImpl.java | 0 .../core/edm/xml/v3/EntityContainerImpl.java | 0 .../client/core/edm/xml/v3/EntitySetImpl.java | 0 .../client/core/edm/xml/v3/EntityTypeImpl.java | 0 .../client/core/edm/xml/v3/EnumTypeImpl.java | 0 .../edm/xml/v3/FunctionImportDeserializer.java | 0 .../client/core/edm/xml/v3/FunctionImportImpl.java | 0 .../odata4/client/core/edm/xml/v3/MemberImpl.java | 0 .../core/edm/xml/v3/NavigationPropertyImpl.java | 0 .../client/core/edm/xml/v3/ParameterImpl.java | 0 .../client/core/edm/xml/v3/PropertyImpl.java | 0 .../client/core/edm/xml/v3/PropertyValueImpl.java | 0 .../core/edm/xml/v3/ReferentialConstraintImpl.java | 0 .../v3/ReferentialConstraintRoleDeserializer.java | 0 .../edm/xml/v3/ReferentialConstraintRoleImpl.java | 0 .../odata4/client/core/edm/xml/v3/SchemaImpl.java | 0 .../edm/xml/v3/TypeAnnotationDeserializer.java | 0 .../client/core/edm/xml/v3/TypeAnnotationImpl.java | 0 .../odata4/client/core/edm/xml/v3/UsingImpl.java | 0 .../core/edm/xml/v3/ValueAnnotationImpl.java | 0 .../client/core/edm/xml/v3/ValueTermImpl.java | 0 .../client/core/edm/xml/v3/XMLMetadataImpl.java | 0 .../core/edm/xml/v4/AbstractAnnotatedEdmItem.java | 0 .../client/core/edm/xml/v4/ActionDeserializer.java | 0 .../odata4/client/core/edm/xml/v4/ActionImpl.java | 0 .../client/core/edm/xml/v4/ActionImportImpl.java | 0 .../core/edm/xml/v4/AnnotationDeserializer.java | 0 .../client/core/edm/xml/v4/AnnotationImpl.java | 0 .../core/edm/xml/v4/AnnotationsDeserializer.java | 0 .../client/core/edm/xml/v4/AnnotationsImpl.java | 0 .../client/core/edm/xml/v4/ComplexTypeImpl.java | 0 .../client/core/edm/xml/v4/DataServicesImpl.java | 0 .../odata4/client/core/edm/xml/v4/EdmxImpl.java | 0 .../core/edm/xml/v4/EntityContainerImpl.java | 0 .../client/core/edm/xml/v4/EntitySetImpl.java | 0 .../client/core/edm/xml/v4/EntityTypeImpl.java | 0 .../client/core/edm/xml/v4/EnumTypeImpl.java | 0 .../core/edm/xml/v4/FunctionDeserializer.java | 0 .../client/core/edm/xml/v4/FunctionImpl.java | 0 .../client/core/edm/xml/v4/FunctionImportImpl.java | 0 .../core/edm/xml/v4/IncludeAnnotationsImpl.java | 0 .../odata4/client/core/edm/xml/v4/IncludeImpl.java | 0 .../odata4/client/core/edm/xml/v4/MemberImpl.java | 0 .../edm/xml/v4/NavigationPropertyBindingImpl.java | 0 .../edm/xml/v4/NavigationPropertyDeserializer.java | 0 .../core/edm/xml/v4/NavigationPropertyImpl.java | 0 .../client/core/edm/xml/v4/ParameterImpl.java | 0 .../client/core/edm/xml/v4/PropertyImpl.java | 0 .../core/edm/xml/v4/ReferenceDeserializer.java | 0 .../client/core/edm/xml/v4/ReferenceImpl.java | 0 .../core/edm/xml/v4/ReferentialConstraintImpl.java | 0 .../core/edm/xml/v4/ReturnTypeDeserializer.java | 0 .../client/core/edm/xml/v4/ReturnTypeImpl.java | 0 .../odata4/client/core/edm/xml/v4/SchemaImpl.java | 0 .../core/edm/xml/v4/SingletonDeserializer.java | 0 .../client/core/edm/xml/v4/SingletonImpl.java | 0 .../client/core/edm/xml/v4/TermDeserializer.java | 0 .../odata4/client/core/edm/xml/v4/TermImpl.java | 0 .../edm/xml/v4/TypeDefinitionDeserializer.java | 0 .../client/core/edm/xml/v4/TypeDefinitionImpl.java | 0 .../client/core/edm/xml/v4/XMLMetadataImpl.java | 0 .../v4/annotation/AbstractElOrAttrConstruct.java | 0 .../v4/annotation/AnnotatedDynExprConstruct.java | 0 .../core/edm/xml/v4/annotation/AnnotationPath.java | 0 .../client/core/edm/xml/v4/annotation/Apply.java | 0 .../edm/xml/v4/annotation/ApplyDeserializer.java | 0 .../client/core/edm/xml/v4/annotation/Cast.java | 0 .../edm/xml/v4/annotation/CastDeserializer.java | 0 .../core/edm/xml/v4/annotation/Collection.java | 0 .../xml/v4/annotation/CollectionDeserializer.java | 0 .../xml/v4/annotation/ConstExprConstructImpl.java | 0 .../annotation/DynExprConstructDeserializer.java | 0 .../xml/v4/annotation/DynExprConstructImpl.java | 0 .../xml/v4/annotation/DynExprDoubleParamOp.java | 0 .../xml/v4/annotation/DynExprSingleParamOp.java | 0 .../edm/xml/v4/annotation/ExprConstructImpl.java | 0 .../client/core/edm/xml/v4/annotation/If.java | 0 .../client/core/edm/xml/v4/annotation/IsOf.java | 0 .../edm/xml/v4/annotation/IsOfDeserializer.java | 0 .../core/edm/xml/v4/annotation/LabeledElement.java | 0 .../v4/annotation/LabeledElementDeserializer.java | 0 .../xml/v4/annotation/LabeledElementReference.java | 0 .../xml/v4/annotation/NavigationPropertyPath.java | 0 .../client/core/edm/xml/v4/annotation/Null.java | 0 .../edm/xml/v4/annotation/NullDeserializer.java | 0 .../client/core/edm/xml/v4/annotation/Path.java | 0 .../core/edm/xml/v4/annotation/PropertyPath.java | 0 .../core/edm/xml/v4/annotation/PropertyValue.java | 0 .../v4/annotation/PropertyValueDeserializer.java | 0 .../client/core/edm/xml/v4/annotation/Record.java | 0 .../edm/xml/v4/annotation/RecordDeserializer.java | 0 .../client/core/edm/xml/v4/annotation/UrlRef.java | 0 .../edm/xml/v4/annotation/UrlRefDeserializer.java | 0 .../http/AbstractBasicAuthHttpClientFactory.java | 0 .../http/AbstractNTLMAuthHttpClientFactory.java | 0 .../client/core/http/DefaultHttpClientFactory.java | 0 .../core/http/DefaultHttpUriRequestFactory.java | 0 .../olingo/odata4/client/core/http/HttpMerge.java | 0 .../olingo/odata4/client/core/http/HttpPatch.java | 0 .../core/op/impl/AbstractEdmDeserializer.java | 0 .../client/core/op/impl/AbstractJacksonTool.java | 0 .../client/core/op/impl/AbstractODataBinder.java | 0 .../core/op/impl/AbstractODataDeserializer.java | 0 .../client/core/op/impl/AbstractODataReader.java | 0 .../core/op/impl/AbstractODataSerializer.java | 0 .../core/op/impl/ComplexTypeDeserializer.java | 0 .../core/op/impl/EntityContainerDeserializer.java | 0 .../client/core/op/impl/EntityKeyDeserializer.java | 0 .../client/core/op/impl/EntitySetDeserializer.java | 0 .../core/op/impl/EntityTypeDeserializer.java | 0 .../client/core/op/impl/EnumTypeDeserializer.java | 0 .../core/op/impl/InjectableSerializerProvider.java | 0 .../client/core/op/impl/ODataV3BinderImpl.java | 0 .../core/op/impl/ODataV3DeserializerImpl.java | 0 .../client/core/op/impl/ODataV3ReaderImpl.java | 0 .../client/core/op/impl/ODataV3SerializerImpl.java | 0 .../client/core/op/impl/ODataV4BinderImpl.java | 0 .../core/op/impl/ODataV4DeserializerImpl.java | 0 .../client/core/op/impl/ODataV4ReaderImpl.java | 0 .../client/core/op/impl/ODataV4SerializerImpl.java | 0 .../client/core/op/impl/SchemaDeserializer.java | 0 .../odata4/client/core/uri/AbstractURIBuilder.java | 0 .../olingo/odata4/client/core/uri/URIUtils.java | 0 .../odata4/client/core/uri/V3URIBuilderImpl.java | 0 .../odata4/client/core/uri/V4URIBuilderImpl.java | 0 .../core/uri/filter/AbstractComparingFilter.java | 0 .../core/uri/filter/AbstractFilterArgFactory.java | 0 .../core/uri/filter/AbstractFilterFactory.java | 0 .../odata4/client/core/uri/filter/AndFilter.java | 0 .../odata4/client/core/uri/filter/EqFilter.java | 0 .../odata4/client/core/uri/filter/FilterConst.java | 0 .../client/core/uri/filter/FilterFunction.java | 0 .../client/core/uri/filter/FilterLambda.java | 0 .../client/core/uri/filter/FilterLiteral.java | 0 .../odata4/client/core/uri/filter/FilterOp.java | 0 .../client/core/uri/filter/FilterProperty.java | 0 .../odata4/client/core/uri/filter/GeFilter.java | 0 .../odata4/client/core/uri/filter/GtFilter.java | 0 .../odata4/client/core/uri/filter/HasFilter.java | 0 .../odata4/client/core/uri/filter/LeFilter.java | 0 .../odata4/client/core/uri/filter/LtFilter.java | 0 .../odata4/client/core/uri/filter/MatchFilter.java | 0 .../odata4/client/core/uri/filter/NeFilter.java | 0 .../odata4/client/core/uri/filter/NotFilter.java | 0 .../odata4/client/core/uri/filter/OrFilter.java | 0 .../core/uri/filter/V3FilterArgFactoryImpl.java | 0 .../core/uri/filter/V3FilterFactoryImpl.java | 0 .../core/uri/filter/V4FilterArgFactoryImpl.java | 0 .../core/uri/filter/V4FilterFactoryImpl.java | 0 .../odata4/client/core/xml/AbstractDOMParser.java | 0 .../client/core/xml/AndroidDOMParserImpl.java | 0 .../client/core/xml/DefaultDOMParserImpl.java | 0 .../olingo/odata4/client/core/xml/XMLParser.java | 0 .../olingo/odata4/client/core/AbstractTest.java | 0 .../olingo/odata4/client/core/ODataClientTest.java | 0 .../core/deserializer/JsonReaderPerformance.java | 0 .../client/core/deserializer/JsonReaderTest.java | 0 .../odata4/client/core/v3/FilterFactoryTest.java | 0 .../olingo/odata4/client/core/v3/MetadataTest.java | 0 .../odata4/client/core/v3/ServiceDocumentTest.java | 0 .../odata4/client/core/v3/URIBuilderTest.java | 0 .../odata4/client/core/v4/FilterFactoryTest.java | 0 .../olingo/odata4/client/core/v4/MetadataTest.java | 0 .../odata4/client/core/v4/ServiceDocumentTest.java | 0 .../odata4/client/core/v4/URIBuilderTest.java | 0 .../src/test/resources/complexProperty.json | 0 .../src/test/resources/fullEntity.json | 0 .../src/test/resources/fullEntitySet.json | 0 .../resources/fullEntitySetWithTwoEntities.json | 0 .../fullEntityWithCollectionOfComplexValues.json | 0 .../src/test/resources/minimalEntity.json | 0 .../olingo/odata4/client/core/v3/metadata.xml | 0 .../odata4/client/core/v3/northwind-metadata.xml | 0 .../odata4/client/core/v3/serviceDocument.json | 0 .../odata4/client/core/v3/serviceDocument.xml | 0 .../olingo/odata4/client/core/v4/demo-metadata.xml | 0 .../odata4/client/core/v4/fromdoc1-metadata.xml | 0 .../odata4/client/core/v4/fromdoc2-metadata.xml | 0 .../odata4/client/core/v4/fromdoc3-metadata.xml | 0 .../olingo/odata4/client/core/v4/metadata.xml | 0 .../odata4/client/core/v4/northwind-metadata.xml | 0 .../odata4/client/core/v4/serviceDocument.json | 0 .../odata4/client/core/v4/serviceDocument.xml | 0 .../src/test/resources/primitiveNullValue.json | 0 .../src/test/resources/setOfComplexProperties.json | 0 .../test/resources/setOfPrimitiveProperties.json | 0 .../odata4-commons-api => lib/commons-api}/pom.xml | 0 .../commons/api/ODataApplicationException.java | 0 .../olingo/odata4/commons/api/ODataException.java | 0 .../commons/api/ODataNotImplementedException.java | 0 .../apache/olingo/odata4/commons/api/edm/Edm.java | 0 .../olingo/odata4/commons/api/edm/EdmAction.java | 0 .../odata4/commons/api/edm/EdmActionImport.java | 0 .../commons/api/edm/EdmActionImportInfo.java | 0 .../odata4/commons/api/edm/EdmAnnotatable.java | 0 .../odata4/commons/api/edm/EdmAnnotations.java | 0 .../odata4/commons/api/edm/EdmBindingTarget.java | 0 .../odata4/commons/api/edm/EdmComplexType.java | 0 .../olingo/odata4/commons/api/edm/EdmElement.java | 0 .../odata4/commons/api/edm/EdmEntityContainer.java | 0 .../odata4/commons/api/edm/EdmEntitySet.java | 0 .../odata4/commons/api/edm/EdmEntitySetInfo.java | 0 .../odata4/commons/api/edm/EdmEntityType.java | 0 .../olingo/odata4/commons/api/edm/EdmEnumType.java | 0 .../odata4/commons/api/edm/EdmException.java | 0 .../olingo/odata4/commons/api/edm/EdmFunction.java | 0 .../odata4/commons/api/edm/EdmFunctionImport.java | 0 .../commons/api/edm/EdmFunctionImportInfo.java | 0 .../odata4/commons/api/edm/EdmKeyPropertyRef.java | 0 .../olingo/odata4/commons/api/edm/EdmMappable.java | 0 .../olingo/odata4/commons/api/edm/EdmMapping.java | 0 .../olingo/odata4/commons/api/edm/EdmMember.java | 0 .../olingo/odata4/commons/api/edm/EdmNamed.java | 0 .../commons/api/edm/EdmNavigationProperty.java | 0 .../odata4/commons/api/edm/EdmOperation.java | 0 .../odata4/commons/api/edm/EdmOperationImport.java | 0 .../commons/api/edm/EdmOperationImportInfo.java | 0 .../odata4/commons/api/edm/EdmParameter.java | 0 .../odata4/commons/api/edm/EdmPrimitiveType.java | 0 .../commons/api/edm/EdmPrimitiveTypeException.java | 0 .../olingo/odata4/commons/api/edm/EdmProperty.java | 0 .../odata4/commons/api/edm/EdmReturnType.java | 0 .../odata4/commons/api/edm/EdmServiceMetadata.java | 0 .../odata4/commons/api/edm/EdmSingleton.java | 0 .../odata4/commons/api/edm/EdmSingletonInfo.java | 0 .../odata4/commons/api/edm/EdmStructuredType.java | 0 .../olingo/odata4/commons/api/edm/EdmTerm.java | 0 .../olingo/odata4/commons/api/edm/EdmType.java | 0 .../odata4/commons/api/edm/EdmTypeDefinition.java | 0 .../olingo/odata4/commons/api/edm/EdmTyped.java | 0 .../odata4/commons/api/edm/FullQualifiedName.java | 0 .../olingo/odata4/commons/api/edm/Target.java | 0 .../commons/api/edm/constants/ConcurrencyMode.java | 0 .../commons/api/edm/constants/EdmContentKind.java | 0 .../commons/api/edm/constants/EdmOnDelete.java | 0 .../commons/api/edm/constants/EdmTargetPath.java | 0 .../commons/api/edm/constants/EdmTypeKind.java | 0 .../api/edm/constants/ODataServiceVersion.java | 0 .../api/edm/constants/StoreGeneratedPattern.java | 0 .../odata4/commons/api/edm/package-info.java | 0 .../commons-core}/pom.xml | 0 .../commons/core/edm/AbstractEdmBindingTarget.java | 0 .../commons/core/edm/AbstractEdmComplexType.java | 0 .../core/edm/AbstractEdmEntityContainer.java | 0 .../commons/core/edm/AbstractEdmEntityType.java | 0 .../commons/core/edm/AbstractEdmEnumType.java | 0 .../odata4/commons/core/edm/AbstractEdmImpl.java | 0 .../core/edm/AbstractEdmKeyPropertyRef.java | 0 .../core/edm/AbstractEdmNavigationProperty.java | 0 .../commons/core/edm/AbstractEdmOperation.java | 0 .../core/edm/AbstractEdmOperationImport.java | 0 .../commons/core/edm/AbstractEdmParameter.java | 0 .../commons/core/edm/AbstractEdmProperty.java | 0 .../commons/core/edm/AbstractEdmReturnType.java | 0 .../core/edm/AbstractEdmStructuredType.java | 0 .../core/edm/AbstractEdmTypeDefinition.java | 0 .../odata4/commons/core/edm/ActionMapKey.java | 0 .../commons/core/edm/EdmActionImportInfoImpl.java | 0 .../odata4/commons/core/edm/EdmElementImpl.java | 0 .../commons/core/edm/EdmEntitySetInfoImpl.java | 0 .../core/edm/EdmFunctionImportInfoImpl.java | 0 .../odata4/commons/core/edm/EdmMemberImpl.java | 0 .../odata4/commons/core/edm/EdmNamedImpl.java | 0 .../core/edm/EdmOperationImportInfoImpl.java | 0 .../commons/core/edm/EdmSingletonInfoImpl.java | 0 .../commons/core/edm/EdmStructuredTypeHelper.java | 0 .../odata4/commons/core/edm/EdmTypeImpl.java | 0 .../odata4/commons/core/edm/FunctionMapKey.java | 0 .../edm/primitivetype/AbstractPrimitiveType.java | 0 .../commons/core/edm/primitivetype/EdmBinary.java | 0 .../commons/core/edm/primitivetype/EdmBoolean.java | 0 .../commons/core/edm/primitivetype/EdmByte.java | 0 .../commons/core/edm/primitivetype/EdmDate.java | 0 .../core/edm/primitivetype/EdmDateTimeOffset.java | 0 .../commons/core/edm/primitivetype/EdmDecimal.java | 0 .../commons/core/edm/primitivetype/EdmDouble.java | 0 .../core/edm/primitivetype/EdmDuration.java | 0 .../commons/core/edm/primitivetype/EdmGuid.java | 0 .../commons/core/edm/primitivetype/EdmInt16.java | 0 .../commons/core/edm/primitivetype/EdmInt32.java | 0 .../commons/core/edm/primitivetype/EdmInt64.java | 0 .../commons/core/edm/primitivetype/EdmNull.java | 0 .../edm/primitivetype/EdmPrimitiveTypeKind.java | 0 .../commons/core/edm/primitivetype/EdmSByte.java | 0 .../commons/core/edm/primitivetype/EdmSingle.java | 0 .../commons/core/edm/primitivetype/EdmString.java | 0 .../core/edm/primitivetype/EdmTimeOfDay.java | 0 .../edm/primitivetype/SingletonPrimitiveType.java | 0 .../commons/core/edm/primitivetype/Uint7.java | 0 .../odata4/commons/core/edm/ActionMapKeyTest.java | 0 .../commons/core/edm/EdmImplCachingTest.java | 0 .../commons/core/edm/EdmImplCallCreateTest.java | 0 .../commons/core/edm/FunctionMapKeyTest.java | 0 .../edm/primitivetype/CommonPrimitiveTypeTest.java | 0 .../core/edm/primitivetype/EdmBinaryTest.java | 0 .../core/edm/primitivetype/EdmBooleanTest.java | 0 .../core/edm/primitivetype/EdmByteTest.java | 0 .../core/edm/primitivetype/EdmDateTest.java | 0 .../edm/primitivetype/EdmDateTimeOffsetTest.java | 0 .../core/edm/primitivetype/EdmDecimalTest.java | 0 .../core/edm/primitivetype/EdmDoubleTest.java | 0 .../core/edm/primitivetype/EdmDurationTest.java | 0 .../core/edm/primitivetype/EdmGuidTest.java | 0 .../core/edm/primitivetype/EdmInt16Test.java | 0 .../core/edm/primitivetype/EdmInt32Test.java | 0 .../core/edm/primitivetype/EdmInt64Test.java | 0 .../core/edm/primitivetype/EdmNullTest.java | 0 .../core/edm/primitivetype/EdmSByteTest.java | 0 .../core/edm/primitivetype/EdmSingleTest.java | 0 .../core/edm/primitivetype/EdmStringTest.java | 0 .../core/edm/primitivetype/EdmTimeOfDayTest.java | 0 .../edm/primitivetype/PrimitiveTypeBaseTest.java | 0 .../commons/core/edm/primitivetype/UInt7Test.java | 0 {odata4-lib => lib}/pom.xml | 14 +++++++------- {odata4-lib/odata4-ref => lib/ref}/pom.xml | 0 .../odata4-server-api => lib/server-api}/pom.xml | 0 .../odata4/server/api/edm/provider/Action.java | 0 .../server/api/edm/provider/ActionImport.java | 0 .../odata4/server/api/edm/provider/AliasInfo.java | 0 .../odata4/server/api/edm/provider/Annotation.java | 0 .../server/api/edm/provider/BindingTarget.java | 0 .../server/api/edm/provider/ComplexType.java | 0 .../server/api/edm/provider/EdmProvider.java | 0 .../server/api/edm/provider/EntityContainer.java | 0 .../api/edm/provider/EntityContainerInfo.java | 0 .../odata4/server/api/edm/provider/EntitySet.java | 0 .../server/api/edm/provider/EntitySetPath.java | 0 .../odata4/server/api/edm/provider/EntityType.java | 0 .../odata4/server/api/edm/provider/EnumMember.java | 0 .../odata4/server/api/edm/provider/EnumType.java | 0 .../odata4/server/api/edm/provider/Expression.java | 0 .../odata4/server/api/edm/provider/Function.java | 0 .../server/api/edm/provider/FunctionImport.java | 0 .../odata4/server/api/edm/provider/Mapping.java | 0 .../api/edm/provider/NavigationProperty.java | 0 .../edm/provider/NavigationPropertyBinding.java | 0 .../odata4/server/api/edm/provider/Operation.java | 0 .../server/api/edm/provider/OperationImport.java | 0 .../odata4/server/api/edm/provider/Parameter.java | 0 .../odata4/server/api/edm/provider/Property.java | 0 .../server/api/edm/provider/PropertyRef.java | 0 .../api/edm/provider/ReferentialConstraint.java | 0 .../odata4/server/api/edm/provider/ReturnType.java | 0 .../odata4/server/api/edm/provider/Schema.java | 0 .../odata4/server/api/edm/provider/Singleton.java | 0 .../server/api/edm/provider/StructuredType.java | 0 .../odata4/server/api/edm/provider/Term.java | 0 .../server/api/edm/provider/TypeDefinition.java | 0 .../olingo/odata4/server/api/uri/UriInfo.java | 0 .../olingo/odata4/server/api/uri/UriInfoAll.java | 0 .../olingo/odata4/server/api/uri/UriInfoBatch.java | 0 .../odata4/server/api/uri/UriInfoCrossjoin.java | 0 .../odata4/server/api/uri/UriInfoEntityId.java | 0 .../olingo/odata4/server/api/uri/UriInfoKind.java | 0 .../odata4/server/api/uri/UriInfoMetadata.java | 0 .../odata4/server/api/uri/UriInfoResource.java | 0 .../odata4/server/api/uri/UriInfoService.java | 0 .../olingo/odata4/server/api/uri/UriParameter.java | 0 .../olingo/odata4/server/api/uri/UriResource.java | 0 .../odata4/server/api/uri/UriResourceAction.java | 0 .../server/api/uri/UriResourceComplexProperty.java | 0 .../odata4/server/api/uri/UriResourceCount.java | 0 .../server/api/uri/UriResourceEntitySet.java | 0 .../odata4/server/api/uri/UriResourceFunction.java | 0 .../odata4/server/api/uri/UriResourceIt.java | 0 .../odata4/server/api/uri/UriResourceKind.java | 0 .../server/api/uri/UriResourceLambdaAll.java | 0 .../server/api/uri/UriResourceLambdaAny.java | 0 .../server/api/uri/UriResourceLambdaVariable.java | 0 .../server/api/uri/UriResourceNavigation.java | 0 .../server/api/uri/UriResourcePartTyped.java | 0 .../api/uri/UriResourcePrimitiveProperty.java | 0 .../odata4/server/api/uri/UriResourceProperty.java | 0 .../odata4/server/api/uri/UriResourceRef.java | 0 .../odata4/server/api/uri/UriResourceRoot.java | 0 .../server/api/uri/UriResourceSingleton.java | 0 .../odata4/server/api/uri/UriResourceValue.java | 0 .../api/uri/queryoption/AliasQueryOption.java | 0 .../server/api/uri/queryoption/CountOption.java | 0 .../api/uri/queryoption/CustomQueryOption.java | 0 .../api/uri/queryoption/ExceptionVisitExpand.java | 0 .../server/api/uri/queryoption/ExpandItem.java | 0 .../server/api/uri/queryoption/ExpandOption.java | 0 .../server/api/uri/queryoption/FilterOption.java | 0 .../server/api/uri/queryoption/FormatOption.java | 0 .../server/api/uri/queryoption/IdOption.java | 0 .../api/uri/queryoption/LevelsExpandOption.java | 0 .../server/api/uri/queryoption/OrderByItem.java | 0 .../server/api/uri/queryoption/OrderByOption.java | 0 .../server/api/uri/queryoption/QueryOption.java | 0 .../server/api/uri/queryoption/SearchOption.java | 0 .../server/api/uri/queryoption/SelectItem.java | 0 .../server/api/uri/queryoption/SelectOption.java | 0 .../server/api/uri/queryoption/SkipOption.java | 0 .../api/uri/queryoption/SkipTokenOption.java | 0 .../api/uri/queryoption/SupportedQueryOptions.java | 0 .../api/uri/queryoption/SystemQueryOption.java | 0 .../server/api/uri/queryoption/TopOption.java | 0 .../queryoption/expression/AliasExpression.java | 0 .../queryoption/expression/BinaryExpression.java | 0 .../queryoption/expression/BinaryOperatorKind.java | 0 .../uri/queryoption/expression/Enumeration.java | 0 .../api/uri/queryoption/expression/Expression.java | 0 .../expression/ExpressionVisitException.java | 0 .../queryoption/expression/ExpressionVisitor.java | 0 .../api/uri/queryoption/expression/LambdaRef.java | 0 .../api/uri/queryoption/expression/Literal.java | 0 .../api/uri/queryoption/expression/Member.java | 0 .../api/uri/queryoption/expression/MethodCall.java | 0 .../uri/queryoption/expression/MethodCallKind.java | 0 .../uri/queryoption/expression/TypeLiteral.java | 0 .../uri/queryoption/expression/UnaryOperator.java | 0 .../queryoption/expression/UnaryOperatorKind.java | 0 .../queryoption/expression/VisitableExression.java | 0 .../api/uri/queryoption/search/SearchBinary.java | 0 .../search/SearchBinaryOperatorKind.java | 0 .../uri/queryoption/search/SearchExpression.java | 0 .../api/uri/queryoption/search/SearchTerm.java | 0 .../api/uri/queryoption/search/SearchUnary.java | 0 .../search/SearchUnaryOperatorKind.java | 0 .../odata4-server-core => lib/server-core}/pom.xml | 0 .../odata4/server/core/uri/antlr/UriLexer.g4 | 0 .../odata4/server/core/uri/antlr/UriParser.g4 | 0 .../server/core/edm/provider/EdmActionImpl.java | 0 .../core/edm/provider/EdmActionImportImpl.java | 0 .../core/edm/provider/EdmBindingTargetImpl.java | 0 .../core/edm/provider/EdmComplexTypeImpl.java | 0 .../core/edm/provider/EdmEntityContainerImpl.java | 0 .../server/core/edm/provider/EdmEntitySetImpl.java | 0 .../core/edm/provider/EdmEntityTypeImpl.java | 0 .../server/core/edm/provider/EdmEnumTypeImpl.java | 0 .../server/core/edm/provider/EdmFunctionImpl.java | 0 .../core/edm/provider/EdmFunctionImportImpl.java | 0 .../core/edm/provider/EdmKeyPropertyRefImpl.java | 0 .../edm/provider/EdmNavigationPropertyImpl.java | 0 .../server/core/edm/provider/EdmOperationImpl.java | 0 .../core/edm/provider/EdmOperationImportImpl.java | 0 .../server/core/edm/provider/EdmParameterImpl.java | 0 .../server/core/edm/provider/EdmPropertyImpl.java | 0 .../server/core/edm/provider/EdmProviderImpl.java | 0 .../core/edm/provider/EdmReturnTypeImpl.java | 0 .../core/edm/provider/EdmServiceMetadataImpl.java | 0 .../server/core/edm/provider/EdmSingletonImpl.java | 0 .../edm/provider/EdmStructuredTypeHelperImpl.java | 0 .../core/edm/provider/EdmTypeDefinitionImpl.java | 0 .../olingo/odata4/server/core/uri/UriInfoImpl.java | 0 .../odata4/server/core/uri/UriParameterImpl.java | 0 .../server/core/uri/UriResourceActionImpl.java | 0 .../core/uri/UriResourceComplexPropertyImpl.java | 0 .../server/core/uri/UriResourceCountImpl.java | 0 .../server/core/uri/UriResourceEntitySetImpl.java | 0 .../server/core/uri/UriResourceFunctionImpl.java | 0 .../odata4/server/core/uri/UriResourceImpl.java | 0 .../odata4/server/core/uri/UriResourceItImpl.java | 0 .../server/core/uri/UriResourceLambdaAllImpl.java | 0 .../server/core/uri/UriResourceLambdaAnyImpl.java | 0 .../server/core/uri/UriResourceLambdaVarImpl.java | 0 .../uri/UriResourceNavigationPropertyImpl.java | 0 .../core/uri/UriResourcePrimitivePropertyImpl.java | 0 .../odata4/server/core/uri/UriResourceRefImpl.java | 0 .../server/core/uri/UriResourceRootImpl.java | 0 .../server/core/uri/UriResourceSingletonImpl.java | 0 .../uri/UriResourceStartingTypeFilterImpl.java | 0 .../server/core/uri/UriResourceTypedImpl.java | 0 .../server/core/uri/UriResourceValueImpl.java | 0 .../server/core/uri/UriResourceWithKeysImpl.java | 0 .../core/uri/parser/CheckFullContextListener.java | 0 .../odata4/server/core/uri/parser/Parser.java | 0 .../odata4/server/core/uri/parser/RawUri.java | 0 .../odata4/server/core/uri/parser/UriContext.java | 0 .../odata4/server/core/uri/parser/UriDecoder.java | 0 .../core/uri/parser/UriParseTreeVisitor.java | 0 .../server/core/uri/parser/UriParserException.java | 0 .../uri/parser/UriParserSemanticException.java | 0 .../core/uri/parser/UriParserSyntaxException.java | 0 .../core/uri/queryoption/AliasQueryOptionImpl.java | 0 .../core/uri/queryoption/CountOptionImpl.java | 0 .../uri/queryoption/CustomQueryOptionImpl.java | 0 .../core/uri/queryoption/ExpandItemImpl.java | 0 .../core/uri/queryoption/ExpandOptionImpl.java | 0 .../core/uri/queryoption/FilterOptionImpl.java | 0 .../core/uri/queryoption/FormatOptionImpl.java | 0 .../server/core/uri/queryoption/IdOptionImpl.java | 0 .../core/uri/queryoption/LevelsOptionImpl.java | 0 .../core/uri/queryoption/OrderByItemImpl.java | 0 .../core/uri/queryoption/OrderByOptionImpl.java | 0 .../core/uri/queryoption/QueryOptionImpl.java | 0 .../core/uri/queryoption/SearchOptionImpl.java | 0 .../core/uri/queryoption/SelectItemImpl.java | 0 .../core/uri/queryoption/SelectOptionImpl.java | 0 .../core/uri/queryoption/SkipOptionImpl.java | 0 .../core/uri/queryoption/SkipTokenOptionImpl.java | 0 .../uri/queryoption/SystemQueryOptionImpl.java | 0 .../server/core/uri/queryoption/TopOptionImpl.java | 0 .../core/uri/queryoption/expression/AliasImpl.java | 0 .../uri/queryoption/expression/BinaryImpl.java | 0 .../queryoption/expression/EnumerationImpl.java | 0 .../uri/queryoption/expression/ExpressionImpl.java | 0 .../uri/queryoption/expression/LambdaRefImpl.java | 0 .../uri/queryoption/expression/LiteralImpl.java | 0 .../uri/queryoption/expression/MemberImpl.java | 0 .../uri/queryoption/expression/MethodCallImpl.java | 0 .../queryoption/expression/TypeLiteralImpl.java | 0 .../core/uri/queryoption/expression/UnaryImpl.java | 0 .../core/edm/provider/EdmActionImplTest.java | 0 .../core/edm/provider/EdmActionImportImplTest.java | 0 .../core/edm/provider/EdmComplexTypeImplTest.java | 0 .../edm/provider/EdmEntityContainerImplTest.java | 0 .../core/edm/provider/EdmEntitySetImplTest.java | 0 .../core/edm/provider/EdmEntityTypeImplTest.java | 0 .../server/core/edm/provider/EdmEnumTest.java | 0 .../core/edm/provider/EdmFunctionImplTest.java | 0 .../edm/provider/EdmFunctionImportImplTest.java | 0 .../edm/provider/EdmKeyPropertyRefImplTest.java | 0 .../core/edm/provider/EdmMemberImplTest.java | 0 .../server/core/edm/provider/EdmNamedImplTest.java | 0 .../provider/EdmNavigationPropertyImplTest.java | 0 .../core/edm/provider/EdmParameterImplTest.java | 0 .../core/edm/provider/EdmPropertyImplTest.java | 0 .../provider/EdmProviderImplOverloadingTest.java | 0 .../core/edm/provider/EdmProviderImplTest.java | 0 .../core/edm/provider/EdmReturnTypeImplTest.java | 0 .../edm/provider/EdmServiceMetadataImplTest.java | 0 .../core/edm/provider/EdmSingletonImplTest.java | 0 .../edm/provider/EdmTypeDefinitionImplTest.java | 0 .../server/core/edm/provider/EdmTypeImplTest.java | 0 .../core/edm/provider/PrimitiveTypeBaseTest.java | 0 .../server/core/testutil/EdmTechProvider.java | 0 .../server/core/testutil/EdmTechTestProvider.java | 0 .../olingo/odata4/server/core/uri/RawUriTest.java | 0 .../odata4/server/core/uri/UriInfoImplTest.java | 0 .../server/core/uri/UriResourceImplTest.java | 0 .../core/uri/antlr/TestFullResourcePath.java | 0 .../odata4/server/core/uri/antlr/TestLexer.java | 0 .../server/core/uri/antlr/TestUriParserImpl.java | 0 .../core/uri/queryoption/QueryOptionTest.java | 0 .../uri/queryoption/expression/ExpressionTest.java | 0 .../server/core/uri/testutil/ExpandValidator.java | 0 .../server/core/uri/testutil/FilterTreeToText.java | 0 .../server/core/uri/testutil/FilterValidator.java | 0 .../server/core/uri/testutil/ParseTreeToText.java | 0 .../server/core/uri/testutil/ParserValidator.java | 0 .../core/uri/testutil/ParserWithLogging.java | 0 .../core/uri/testutil/ResourceValidator.java | 0 .../server/core/uri/testutil/TestErrorLogger.java | 0 .../server/core/uri/testutil/TokenValidator.java | 0 .../core/uri/testutil/UriLexerWithTrace.java | 0 .../server/core/uri/testutil/UriValidator.java | 0 .../odata4/server/core/uri/testutil/Validator.java | 0 pom.xml | 4 ++-- 787 files changed, 9 insertions(+), 9 deletions(-) rename {odata4-fit => fit}/pom.xml (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/pom.xml (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/Configuration.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/Constants.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/ODataClient.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/ODataConstants.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/ODataError.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/ODataV3Client.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/ODataV4Client.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/V3Configuration.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/V4Configuration.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocument.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocumentItem.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ClientException.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/EdmSimpleType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataCollectionValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataComplexValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataDuration.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataGeospatialValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataInvokeResult.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataPrimitiveValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataServiceDocument.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataTimestamp.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/ComposedGeospatial.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Geospatial.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/GeospatialCollection.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/LineString.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiLineString.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPoint.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPolygon.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Point.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Polygon.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonFunctionImport.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonNavigationProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/ComplexType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Member.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/XMLMetadata.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ParameterMode.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/CSDLElement.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OperationImport.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Property.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/XMLMetadata.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ConstExprConstruct.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/DynExprConstruct.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ExprConstruct.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/format/ODataFormat.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/format/ODataMediaFormat.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/format/ODataPubFormat.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/format/ODataValueFormat.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientException.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/http/HttpMethod.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/http/HttpUriRequestFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/http/NoContentException.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataBinder.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataDeserializer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataReader.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataSerializer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV3Deserializer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV4Deserializer.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/QueryOption.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/SegmentType.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/URIBuilder.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/V3URIBuilder.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/V4URIBuilder.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArg.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArgFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/URIFilter.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterArgFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterArgFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterFactory.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/utils/EdmTypeInfo.java (100%) rename {odata4-lib/odata4-client-api => lib/client-api}/src/main/java/org/apache/olingo/odata4/client/api/utils/XMLUtils.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/pom.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/AbstractConfiguration.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/AbstractODataClient.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/ODataClientFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/ODataV3ClientImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/ODataV4ClientImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/V3ConfigurationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/V4ConfigurationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/AbstractServiceDocument.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/JSONServiceDocumentDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonSerializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/ServiceDocumentItemImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/XMLServiceDocumentDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/v3/JSONServiceDocumentImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/v3/XMLServiceDocumentImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/v4/AbstractServiceDocument.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/v4/JSONServiceDocumentImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/data/v4/XMLServiceDocumentImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/AbstractEdmServiceMetadataImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmClientImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmComplexTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityContainerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntitySetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEnumTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmKeyPropertyRefImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmNavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmParameterImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmReturnTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmSingletonImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmStructuredTypeHelperImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmTypeDefinitionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionImportProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmEntitySetProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionImportProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmOperationProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmServiceMetadataImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/ReturnTypeProxy.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/V3FunctionImportUtils.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/v4/EdmServiceMetadataImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractAnnotations.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractComplexType.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractDataServices.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmItem.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmx.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityContainer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntitySet.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityType.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEnumType.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractMember.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractNavigationProperty.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractParameter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractProperty.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractSchema.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractXMLMetadata.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/DataServicesDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EdmxDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EntityKeyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/OnDeleteImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/ParameterDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyRefImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationEndImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetEndImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ComplexTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/DataServicesImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EdmxImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityContainerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntitySetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EnumTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/MemberImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImportImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeAnnotationsImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/MemberImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ParameterImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/PropertyImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferentialConstraintImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SchemaImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/XMLMetadataImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AbstractElOrAttrConstruct.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotatedDynExprConstruct.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotationPath.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Apply.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ApplyDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Cast.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CastDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Collection.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CollectionDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ConstExprConstructImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprDoubleParamOp.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprSingleParamOp.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ExprConstructImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/If.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOf.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOfDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElement.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementReference.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NavigationPropertyPath.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Null.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NullDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Path.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyPath.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValue.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Record.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/RecordDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRef.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractBasicAuthHttpClientFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractNTLMAuthHttpClientFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpClientFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpUriRequestFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/HttpMerge.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/http/HttpPatch.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractEdmDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractJacksonTool.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataBinder.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataReader.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataSerializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ComplexTypeDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityContainerDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityKeyDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntitySetDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityTypeDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EnumTypeDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/InjectableSerializerProvider.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3BinderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3DeserializerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3ReaderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3SerializerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4BinderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4DeserializerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4ReaderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4SerializerImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/op/impl/SchemaDeserializer.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/AbstractURIBuilder.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/URIUtils.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/V3URIBuilderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/V4URIBuilderImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractComparingFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterArgFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterFactory.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AndFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/EqFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterConst.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterFunction.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLambda.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLiteral.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterOp.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterProperty.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GeFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GtFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/HasFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LeFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LtFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/MatchFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NeFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NotFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/OrFilter.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterArgFactoryImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterFactoryImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterArgFactoryImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterFactoryImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/xml/AbstractDOMParser.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/xml/AndroidDOMParserImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/xml/DefaultDOMParserImpl.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/main/java/org/apache/olingo/odata4/client/core/xml/XMLParser.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/AbstractTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/ODataClientTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v3/FilterFactoryTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v3/MetadataTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v3/ServiceDocumentTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v3/URIBuilderTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v4/FilterFactoryTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v4/MetadataTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v4/ServiceDocumentTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/java/org/apache/olingo/odata4/client/core/v4/URIBuilderTest.java (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/complexProperty.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/fullEntity.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/fullEntitySet.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/fullEntitySetWithTwoEntities.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/fullEntityWithCollectionOfComplexValues.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/minimalEntity.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v3/metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v3/northwind-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/primitiveNullValue.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/setOfComplexProperties.json (100%) rename {odata4-lib/odata4-client-core => lib/client-core}/src/test/resources/setOfPrimitiveProperties.json (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/pom.xml (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImportInfo.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySetInfo.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImportInfo.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMappable.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMapping.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImportInfo.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingletonInfo.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuredType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/Target.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ConcurrencyMode.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmContentKind.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ODataServiceVersion.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/StoreGeneratedPattern.java (100%) rename {odata4-lib/odata4-commons-api => lib/commons-api}/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/pom.xml (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmBindingTarget.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmComplexType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityContainer.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEnumType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmKeyPropertyRef.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmNavigationProperty.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperation.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperationImport.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmParameter.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmProperty.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmReturnType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmStructuredType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmTypeDefinition.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmActionImportInfoImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmElementImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmEntitySetInfoImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmFunctionImportInfoImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmMemberImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmNamedImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmOperationImportInfoImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmSingletonInfoImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmStructuredTypeHelper.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmTypeImpl.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java (100%) rename {odata4-lib/odata4-commons-core => lib/commons-core}/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java (100%) rename {odata4-lib => lib}/pom.xml (84%) rename {odata4-lib/odata4-ref => lib/ref}/pom.xml (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/pom.xml (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaVariable.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CountOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryOperatorKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitException.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCallKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperatorKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinaryOperatorKind.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java (100%) rename {odata4-lib/odata4-server-api => lib/server-api}/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnaryOperatorKind.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/pom.xml (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmBindingTargetImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTypeImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImportImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmStructuredTypeHelperImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/CheckFullContextListener.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserException.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSemanticException.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSyntaxException.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CountOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmMemberImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNamedImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplOverloadingTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/PrimitiveTypeBaseTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/UriResourceImplTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ExpandValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterTreeToText.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParseTreeToText.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserWithLogging.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ResourceValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TestErrorLogger.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TokenValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriLexerWithTrace.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriValidator.java (100%) rename {odata4-lib/odata4-server-core => lib/server-core}/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/Validator.java (100%) diff --git a/odata4-fit/pom.xml b/fit/pom.xml similarity index 100% rename from odata4-fit/pom.xml rename to fit/pom.xml diff --git a/odata4-lib/odata4-client-api/pom.xml b/lib/client-api/pom.xml similarity index 100% rename from odata4-lib/odata4-client-api/pom.xml rename to lib/client-api/pom.xml diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/Configuration.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/Configuration.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/Configuration.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/Configuration.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/Constants.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/Constants.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/Constants.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/Constants.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataClient.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataClient.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataClient.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConstants.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConstants.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConstants.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConstants.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataError.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataError.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataError.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataError.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV3Client.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV3Client.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV3Client.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV3Client.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV4Client.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV4Client.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV4Client.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataV4Client.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/V3Configuration.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/V3Configuration.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/V3Configuration.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/V3Configuration.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/V4Configuration.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/V4Configuration.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/V4Configuration.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/V4Configuration.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocument.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocument.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocument.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocument.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocumentItem.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocumentItem.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocumentItem.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/data/ServiceDocumentItem.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ClientException.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ClientException.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ClientException.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ClientException.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/EdmSimpleType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/EdmSimpleType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/EdmSimpleType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/EdmSimpleType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataCollectionValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataCollectionValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataCollectionValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataCollectionValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataComplexValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataComplexValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataComplexValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataComplexValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataDuration.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataDuration.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataDuration.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataDuration.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataGeospatialValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataGeospatialValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataGeospatialValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataGeospatialValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataInvokeResult.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataInvokeResult.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataInvokeResult.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataInvokeResult.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataPrimitiveValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataPrimitiveValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataPrimitiveValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataPrimitiveValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataServiceDocument.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataServiceDocument.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataServiceDocument.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataServiceDocument.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataTimestamp.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataTimestamp.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataTimestamp.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataTimestamp.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/ODataValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/ComposedGeospatial.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/ComposedGeospatial.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/ComposedGeospatial.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/ComposedGeospatial.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Geospatial.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Geospatial.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Geospatial.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Geospatial.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/GeospatialCollection.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/GeospatialCollection.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/GeospatialCollection.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/GeospatialCollection.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/LineString.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/LineString.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/LineString.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/LineString.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiLineString.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiLineString.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiLineString.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiLineString.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPoint.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPoint.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPoint.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPoint.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPolygon.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPolygon.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPolygon.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/MultiPolygon.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Point.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Point.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Point.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Point.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Polygon.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Polygon.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Polygon.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/domain/geospatial/Polygon.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonFunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonFunctionImport.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonFunctionImport.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonFunctionImport.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonNavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonNavigationProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonNavigationProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonNavigationProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/ComplexType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/ComplexType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/ComplexType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Member.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Member.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Member.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Member.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/XMLMetadata.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/XMLMetadata.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/XMLMetadata.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ParameterMode.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ParameterMode.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ParameterMode.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ParameterMode.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/CSDLElement.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/CSDLElement.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/CSDLElement.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/CSDLElement.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OperationImport.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OperationImport.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OperationImport.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OperationImport.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Property.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Property.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Property.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Property.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/XMLMetadata.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/XMLMetadata.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/XMLMetadata.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ConstExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ConstExprConstruct.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ConstExprConstruct.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ConstExprConstruct.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/DynExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/DynExprConstruct.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/DynExprConstruct.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/DynExprConstruct.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ExprConstruct.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ExprConstruct.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/annotation/ExprConstruct.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataFormat.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataFormat.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataFormat.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataFormat.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataMediaFormat.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataMediaFormat.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataMediaFormat.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataMediaFormat.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataPubFormat.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataPubFormat.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataPubFormat.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataPubFormat.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataValueFormat.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataValueFormat.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataValueFormat.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/format/ODataValueFormat.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientException.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientException.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientException.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientException.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpClientFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpMethod.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpMethod.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpMethod.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpMethod.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpUriRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpUriRequestFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpUriRequestFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/HttpUriRequestFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/NoContentException.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/NoContentException.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/http/NoContentException.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/http/NoContentException.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataBinder.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataBinder.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataBinder.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataDeserializer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataDeserializer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataReader.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataReader.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataReader.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataSerializer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataSerializer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataSerializer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataSerializer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV3Deserializer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV3Deserializer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV3Deserializer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV3Deserializer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV4Deserializer.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV4Deserializer.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV4Deserializer.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/op/ODataV4Deserializer.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/QueryOption.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/QueryOption.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/QueryOption.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/QueryOption.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/SegmentType.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/SegmentType.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/SegmentType.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/SegmentType.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/URIBuilder.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/URIBuilder.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/URIBuilder.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/URIBuilder.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V3URIBuilder.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V3URIBuilder.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V3URIBuilder.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V3URIBuilder.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V4URIBuilder.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V4URIBuilder.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V4URIBuilder.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/V4URIBuilder.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArg.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArg.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArg.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArg.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArgFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArgFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArgFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterArgFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/FilterFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/URIFilter.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/URIFilter.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/URIFilter.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/URIFilter.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterArgFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterArgFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterArgFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterArgFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V3FilterFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterArgFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterArgFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterArgFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterArgFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterFactory.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterFactory.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterFactory.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/uri/filter/V4FilterFactory.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/EdmTypeInfo.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/EdmTypeInfo.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/EdmTypeInfo.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/EdmTypeInfo.java diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/XMLUtils.java b/lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/XMLUtils.java similarity index 100% rename from odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/XMLUtils.java rename to lib/client-api/src/main/java/org/apache/olingo/odata4/client/api/utils/XMLUtils.java diff --git a/odata4-lib/odata4-client-core/pom.xml b/lib/client-core/pom.xml similarity index 100% rename from odata4-lib/odata4-client-core/pom.xml rename to lib/client-core/pom.xml diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractConfiguration.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractConfiguration.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractConfiguration.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractConfiguration.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractODataClient.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractODataClient.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/AbstractODataClient.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataClientFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataClientFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataClientFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3ClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3ClientImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3ClientImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3ClientImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4ClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4ClientImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4ClientImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4ClientImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/V3ConfigurationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/V3ConfigurationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/V3ConfigurationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/V3ConfigurationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/V4ConfigurationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/V4ConfigurationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/V4ConfigurationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/V4ConfigurationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/AbstractServiceDocument.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/AbstractServiceDocument.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/AbstractServiceDocument.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/AbstractServiceDocument.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/JSONServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/JSONServiceDocumentDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/JSONServiceDocumentDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/JSONServiceDocumentDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonSerializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonSerializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ODataJacksonSerializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ServiceDocumentItemImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ServiceDocumentItemImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ServiceDocumentItemImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/ServiceDocumentItemImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/XMLServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/XMLServiceDocumentDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/XMLServiceDocumentDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/XMLServiceDocumentDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/JSONServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/JSONServiceDocumentImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/JSONServiceDocumentImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/JSONServiceDocumentImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/XMLServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/XMLServiceDocumentImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/XMLServiceDocumentImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v3/XMLServiceDocumentImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/AbstractServiceDocument.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/AbstractServiceDocument.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/AbstractServiceDocument.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/AbstractServiceDocument.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/JSONServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/JSONServiceDocumentImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/JSONServiceDocumentImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/JSONServiceDocumentImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/XMLServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/XMLServiceDocumentImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/XMLServiceDocumentImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/data/v4/XMLServiceDocumentImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/AbstractEdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/AbstractEdmServiceMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/AbstractEdmServiceMetadataImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/AbstractEdmServiceMetadataImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmClientImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmClientImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmClientImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmComplexTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmComplexTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmComplexTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityContainerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityContainerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityContainerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntitySetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntitySetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEntityTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEnumTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEnumTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmEnumTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmFunctionImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmKeyPropertyRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmKeyPropertyRefImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmKeyPropertyRefImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmKeyPropertyRefImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmNavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmNavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmNavigationPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmNavigationPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmOperationImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmParameterImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmParameterImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmParameterImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmReturnTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmReturnTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmReturnTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmSingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmSingletonImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmSingletonImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmSingletonImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmStructuredTypeHelperImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmStructuredTypeHelperImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmStructuredTypeHelperImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmTypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmTypeDefinitionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmTypeDefinitionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmTypeDefinitionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionImportProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionImportProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionImportProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmActionProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmEntitySetProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmEntitySetProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmEntitySetProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmEntitySetProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionImportProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionImportProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionImportProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmFunctionProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmOperationProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmOperationProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmOperationProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmOperationProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmServiceMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmServiceMetadataImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/EdmServiceMetadataImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/ReturnTypeProxy.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/ReturnTypeProxy.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/ReturnTypeProxy.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/ReturnTypeProxy.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/V3FunctionImportUtils.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/V3FunctionImportUtils.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/V3FunctionImportUtils.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v3/V3FunctionImportUtils.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v4/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v4/EdmServiceMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v4/EdmServiceMetadataImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/v4/EdmServiceMetadataImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractAnnotations.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractAnnotations.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractAnnotations.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractComplexType.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractComplexType.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractComplexType.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractDataServices.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractDataServices.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractDataServices.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmItem.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmItem.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmItem.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmItem.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmx.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmx.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEdmx.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityContainer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityContainer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityContainer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntitySet.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntitySet.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntitySet.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityType.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityType.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEntityType.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEnumType.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEnumType.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractEnumType.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractMember.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractMember.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractMember.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractMember.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractNavigationProperty.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractNavigationProperty.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractNavigationProperty.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractParameter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractParameter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractParameter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractParameter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractProperty.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractProperty.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractProperty.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractProperty.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractSchema.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractSchema.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractSchema.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractSchema.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractXMLMetadata.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractXMLMetadata.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractXMLMetadata.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/AbstractXMLMetadata.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/DataServicesDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/DataServicesDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/DataServicesDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/DataServicesDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EdmxDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EdmxDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EdmxDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EdmxDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EntityKeyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EntityKeyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EntityKeyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/EntityKeyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/OnDeleteImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/OnDeleteImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/OnDeleteImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/OnDeleteImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/ParameterDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/ParameterDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/ParameterDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/ParameterDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyRefImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyRefImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/PropertyRefImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AnnotationsImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationEndImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationEndImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationEndImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetEndImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetEndImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetEndImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/AssociationSetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ComplexTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ComplexTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ComplexTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/DataServicesImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/DataServicesImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/DataServicesImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EdmxImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EdmxImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EdmxImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityContainerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityContainerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityContainerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntitySetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntitySetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EntityTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EnumTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EnumTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/EnumTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/FunctionImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/MemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/MemberImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/MemberImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/MemberImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/NavigationPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ParameterImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/PropertyValueImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/SchemaImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/TypeAnnotationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/UsingImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueAnnotationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/ValueTermImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v3/XMLMetadataImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AbstractAnnotatedEdmItem.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ActionImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/AnnotationsImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ComplexTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/DataServicesImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EdmxImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityContainerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntitySetImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EntityTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/EnumTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImportImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImportImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/FunctionImportImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeAnnotationsImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeAnnotationsImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeAnnotationsImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/IncludeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/MemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/MemberImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/MemberImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/MemberImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/NavigationPropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ParameterImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ParameterImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ParameterImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/PropertyImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/PropertyImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/PropertyImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferenceImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferentialConstraintImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferentialConstraintImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReferentialConstraintImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/ReturnTypeImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SchemaImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SchemaImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SchemaImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/SingletonImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TermImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/TypeDefinitionImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/XMLMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/XMLMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/XMLMetadataImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/XMLMetadataImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AbstractElOrAttrConstruct.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AbstractElOrAttrConstruct.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AbstractElOrAttrConstruct.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AbstractElOrAttrConstruct.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotatedDynExprConstruct.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotatedDynExprConstruct.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotatedDynExprConstruct.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotatedDynExprConstruct.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotationPath.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotationPath.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotationPath.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/AnnotationPath.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Apply.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Apply.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Apply.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Apply.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ApplyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ApplyDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ApplyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ApplyDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Cast.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Cast.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Cast.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Cast.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CastDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CastDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CastDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CastDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Collection.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Collection.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Collection.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Collection.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CollectionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CollectionDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CollectionDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/CollectionDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ConstExprConstructImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ConstExprConstructImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ConstExprConstructImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ConstExprConstructImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprConstructImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprDoubleParamOp.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprDoubleParamOp.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprDoubleParamOp.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprDoubleParamOp.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprSingleParamOp.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprSingleParamOp.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprSingleParamOp.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/DynExprSingleParamOp.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ExprConstructImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ExprConstructImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ExprConstructImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/ExprConstructImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/If.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/If.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/If.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/If.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOf.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOf.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOf.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOf.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOfDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOfDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOfDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/IsOfDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElement.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElement.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElement.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElement.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementReference.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementReference.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementReference.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/LabeledElementReference.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NavigationPropertyPath.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NavigationPropertyPath.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NavigationPropertyPath.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NavigationPropertyPath.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Null.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Null.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Null.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Null.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NullDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NullDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NullDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/NullDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Path.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Path.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Path.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Path.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyPath.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyPath.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyPath.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyPath.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValue.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValue.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValue.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValue.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Record.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Record.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Record.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/Record.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/RecordDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/RecordDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/RecordDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/RecordDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRef.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRef.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRef.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRef.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractBasicAuthHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractBasicAuthHttpClientFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractBasicAuthHttpClientFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractBasicAuthHttpClientFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractNTLMAuthHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractNTLMAuthHttpClientFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractNTLMAuthHttpClientFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/AbstractNTLMAuthHttpClientFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpClientFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpClientFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpClientFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpUriRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpUriRequestFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpUriRequestFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/DefaultHttpUriRequestFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpMerge.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpMerge.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpMerge.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpMerge.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpPatch.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpPatch.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpPatch.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/http/HttpPatch.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractEdmDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractEdmDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractEdmDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractEdmDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractJacksonTool.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractJacksonTool.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractJacksonTool.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractJacksonTool.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataBinder.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataBinder.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataBinder.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataReader.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataReader.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataReader.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataSerializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataSerializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/AbstractODataSerializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ComplexTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ComplexTypeDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ComplexTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ComplexTypeDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityContainerDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityContainerDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityContainerDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityContainerDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityKeyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityKeyDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityKeyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityKeyDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntitySetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntitySetDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntitySetDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntitySetDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityTypeDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EntityTypeDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EnumTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EnumTypeDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EnumTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/EnumTypeDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/InjectableSerializerProvider.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/InjectableSerializerProvider.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/InjectableSerializerProvider.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/InjectableSerializerProvider.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3BinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3BinderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3BinderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3BinderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3DeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3DeserializerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3DeserializerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3DeserializerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3ReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3ReaderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3ReaderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3ReaderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3SerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3SerializerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3SerializerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV3SerializerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4BinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4BinderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4BinderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4BinderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4DeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4DeserializerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4DeserializerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4DeserializerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4ReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4ReaderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4ReaderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4ReaderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4SerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4SerializerImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4SerializerImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/ODataV4SerializerImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/SchemaDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/SchemaDeserializer.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/SchemaDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/SchemaDeserializer.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/AbstractURIBuilder.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/AbstractURIBuilder.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/AbstractURIBuilder.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/AbstractURIBuilder.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/URIUtils.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/URIUtils.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/URIUtils.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V3URIBuilderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V3URIBuilderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V3URIBuilderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V3URIBuilderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V4URIBuilderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V4URIBuilderImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V4URIBuilderImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/V4URIBuilderImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractComparingFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractComparingFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractComparingFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractComparingFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterArgFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterArgFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterArgFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterArgFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterFactory.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterFactory.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AbstractFilterFactory.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AndFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AndFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AndFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/AndFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/EqFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/EqFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/EqFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/EqFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterConst.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterConst.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterConst.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterConst.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterFunction.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterFunction.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterFunction.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterFunction.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLambda.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLambda.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLambda.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLambda.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLiteral.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLiteral.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLiteral.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterLiteral.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterOp.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterOp.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterOp.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterOp.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterProperty.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterProperty.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterProperty.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/FilterProperty.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GeFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GeFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GeFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GeFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GtFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GtFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GtFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/GtFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/HasFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/HasFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/HasFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/HasFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LeFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LeFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LeFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LeFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LtFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LtFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LtFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/LtFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/MatchFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/MatchFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/MatchFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/MatchFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NeFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NeFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NeFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NeFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NotFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NotFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NotFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/NotFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/OrFilter.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/OrFilter.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/OrFilter.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/OrFilter.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterArgFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterArgFactoryImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterArgFactoryImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterArgFactoryImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterFactoryImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterFactoryImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V3FilterFactoryImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterArgFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterArgFactoryImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterArgFactoryImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterArgFactoryImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterFactoryImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterFactoryImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/uri/filter/V4FilterFactoryImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AbstractDOMParser.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AbstractDOMParser.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AbstractDOMParser.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AbstractDOMParser.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AndroidDOMParserImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AndroidDOMParserImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AndroidDOMParserImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/AndroidDOMParserImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/DefaultDOMParserImpl.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/DefaultDOMParserImpl.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/DefaultDOMParserImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/DefaultDOMParserImpl.java diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/XMLParser.java b/lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/XMLParser.java similarity index 100% rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/XMLParser.java rename to lib/client-core/src/main/java/org/apache/olingo/odata4/client/core/xml/XMLParser.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/AbstractTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/AbstractTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/AbstractTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/AbstractTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataClientTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataClientTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataClientTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataClientTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/FilterFactoryTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/FilterFactoryTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/FilterFactoryTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/MetadataTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/MetadataTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/MetadataTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/ServiceDocumentTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/ServiceDocumentTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/ServiceDocumentTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/URIBuilderTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/URIBuilderTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v3/URIBuilderTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/FilterFactoryTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/FilterFactoryTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/FilterFactoryTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/MetadataTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/MetadataTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/MetadataTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/ServiceDocumentTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/ServiceDocumentTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/ServiceDocumentTest.java diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/URIBuilderTest.java similarity index 100% rename from odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/URIBuilderTest.java rename to lib/client-core/src/test/java/org/apache/olingo/odata4/client/core/v4/URIBuilderTest.java diff --git a/odata4-lib/odata4-client-core/src/test/resources/complexProperty.json b/lib/client-core/src/test/resources/complexProperty.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/complexProperty.json rename to lib/client-core/src/test/resources/complexProperty.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/fullEntity.json b/lib/client-core/src/test/resources/fullEntity.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/fullEntity.json rename to lib/client-core/src/test/resources/fullEntity.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/fullEntitySet.json b/lib/client-core/src/test/resources/fullEntitySet.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/fullEntitySet.json rename to lib/client-core/src/test/resources/fullEntitySet.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/fullEntitySetWithTwoEntities.json b/lib/client-core/src/test/resources/fullEntitySetWithTwoEntities.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/fullEntitySetWithTwoEntities.json rename to lib/client-core/src/test/resources/fullEntitySetWithTwoEntities.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/fullEntityWithCollectionOfComplexValues.json b/lib/client-core/src/test/resources/fullEntityWithCollectionOfComplexValues.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/fullEntityWithCollectionOfComplexValues.json rename to lib/client-core/src/test/resources/fullEntityWithCollectionOfComplexValues.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/minimalEntity.json b/lib/client-core/src/test/resources/minimalEntity.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/minimalEntity.json rename to lib/client-core/src/test/resources/minimalEntity.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/northwind-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/northwind-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/northwind-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/northwind-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.json b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.json rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v3/serviceDocument.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml rename to lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml diff --git a/odata4-lib/odata4-client-core/src/test/resources/primitiveNullValue.json b/lib/client-core/src/test/resources/primitiveNullValue.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/primitiveNullValue.json rename to lib/client-core/src/test/resources/primitiveNullValue.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/setOfComplexProperties.json b/lib/client-core/src/test/resources/setOfComplexProperties.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/setOfComplexProperties.json rename to lib/client-core/src/test/resources/setOfComplexProperties.json diff --git a/odata4-lib/odata4-client-core/src/test/resources/setOfPrimitiveProperties.json b/lib/client-core/src/test/resources/setOfPrimitiveProperties.json similarity index 100% rename from odata4-lib/odata4-client-core/src/test/resources/setOfPrimitiveProperties.json rename to lib/client-core/src/test/resources/setOfPrimitiveProperties.json diff --git a/odata4-lib/odata4-commons-api/pom.xml b/lib/commons-api/pom.xml similarity index 100% rename from odata4-lib/odata4-commons-api/pom.xml rename to lib/commons-api/pom.xml diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImportInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImportInfo.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImportInfo.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImportInfo.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySetInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySetInfo.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySetInfo.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySetInfo.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImportInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImportInfo.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImportInfo.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImportInfo.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMappable.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMappable.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMappable.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMappable.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMapping.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMapping.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMapping.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMapping.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImportInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImportInfo.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImportInfo.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImportInfo.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingletonInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingletonInfo.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingletonInfo.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingletonInfo.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuredType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuredType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuredType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuredType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Target.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Target.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Target.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Target.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ConcurrencyMode.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ConcurrencyMode.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ConcurrencyMode.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ConcurrencyMode.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmContentKind.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmContentKind.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmContentKind.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmContentKind.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ODataServiceVersion.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ODataServiceVersion.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ODataServiceVersion.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/ODataServiceVersion.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/StoreGeneratedPattern.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/StoreGeneratedPattern.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/StoreGeneratedPattern.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/StoreGeneratedPattern.java diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java b/lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java similarity index 100% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java rename to lib/commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java diff --git a/odata4-lib/odata4-commons-core/pom.xml b/lib/commons-core/pom.xml similarity index 100% rename from odata4-lib/odata4-commons-core/pom.xml rename to lib/commons-core/pom.xml diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmBindingTarget.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmBindingTarget.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmBindingTarget.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmBindingTarget.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmComplexType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmComplexType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmComplexType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmComplexType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityContainer.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityContainer.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityContainer.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityContainer.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEntityType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEnumType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEnumType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEnumType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmEnumType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmKeyPropertyRef.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmKeyPropertyRef.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmKeyPropertyRef.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmKeyPropertyRef.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmNavigationProperty.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmNavigationProperty.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmNavigationProperty.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmNavigationProperty.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperation.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperation.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperation.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperation.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperationImport.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperationImport.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperationImport.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmOperationImport.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmParameter.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmParameter.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmParameter.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmParameter.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmProperty.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmProperty.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmProperty.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmProperty.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmReturnType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmReturnType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmReturnType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmReturnType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmStructuredType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmStructuredType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmStructuredType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmStructuredType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmTypeDefinition.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmTypeDefinition.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmTypeDefinition.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/AbstractEdmTypeDefinition.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmActionImportInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmActionImportInfoImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmActionImportInfoImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmActionImportInfoImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmElementImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmElementImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmElementImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmElementImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmEntitySetInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmEntitySetInfoImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmEntitySetInfoImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmEntitySetInfoImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmFunctionImportInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmFunctionImportInfoImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmFunctionImportInfoImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmFunctionImportInfoImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmMemberImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmMemberImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmMemberImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmMemberImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmNamedImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmNamedImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmNamedImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmNamedImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmOperationImportInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmOperationImportInfoImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmOperationImportInfoImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmOperationImportInfoImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmSingletonInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmSingletonInfoImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmSingletonInfoImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmSingletonInfoImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmStructuredTypeHelper.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmStructuredTypeHelper.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmStructuredTypeHelper.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmStructuredTypeHelper.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmTypeImpl.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmTypeImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmTypeImpl.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java b/lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java rename to lib/commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java similarity index 100% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java rename to lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java diff --git a/odata4-lib/pom.xml b/lib/pom.xml similarity index 84% rename from odata4-lib/pom.xml rename to lib/pom.xml index 16e55044a..c09575a71 100644 --- a/odata4-lib/pom.xml +++ b/lib/pom.xml @@ -36,12 +36,12 @@ - odata4-server-api - odata4-server-core - odata4-client-api - odata4-client-core - odata4-commons-api - odata4-commons-core - odata4-ref + server-api + server-core + client-api + client-core + commons-api + commons-core + ref diff --git a/odata4-lib/odata4-ref/pom.xml b/lib/ref/pom.xml similarity index 100% rename from odata4-lib/odata4-ref/pom.xml rename to lib/ref/pom.xml diff --git a/odata4-lib/odata4-server-api/pom.xml b/lib/server-api/pom.xml similarity index 100% rename from odata4-lib/odata4-server-api/pom.xml rename to lib/server-api/pom.xml diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaVariable.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaVariable.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaVariable.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaVariable.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CountOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CountOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CountOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CountOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryOperatorKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryOperatorKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryOperatorKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryOperatorKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitException.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitException.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitException.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitException.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCallKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCallKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCallKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCallKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperatorKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperatorKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperatorKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperatorKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinaryOperatorKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinaryOperatorKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinaryOperatorKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinaryOperatorKind.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchTerm.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnary.java diff --git a/odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnaryOperatorKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnaryOperatorKind.java similarity index 100% rename from odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnaryOperatorKind.java rename to lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchUnaryOperatorKind.java diff --git a/odata4-lib/odata4-server-core/pom.xml b/lib/server-core/pom.xml similarity index 100% rename from odata4-lib/odata4-server-core/pom.xml rename to lib/server-core/pom.xml diff --git a/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 b/lib/server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 similarity index 100% rename from odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 rename to lib/server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriLexer.g4 diff --git a/odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 b/lib/server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 similarity index 100% rename from odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 rename to lib/server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4 diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmBindingTargetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmBindingTargetImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmBindingTargetImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmBindingTargetImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTypeImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTypeImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTypeImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImportImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImportImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmOperationImportImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmStructuredTypeHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmStructuredTypeHelperImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmStructuredTypeHelperImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmStructuredTypeHelperImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/CheckFullContextListener.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/CheckFullContextListener.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/CheckFullContextListener.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/CheckFullContextListener.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserException.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserException.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserException.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserException.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSemanticException.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSemanticException.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSemanticException.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSemanticException.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSyntaxException.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSyntaxException.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSyntaxException.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParserSyntaxException.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/AliasQueryOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CountOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CountOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CountOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CountOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/CustomQueryOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandItemImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/ExpandOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FilterOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/FormatOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/IdOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/LevelsOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByItemImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/OrderByOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SearchOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectItemImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SelectOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SkipTokenOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/SystemQueryOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/TopOptionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/AliasImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/BinaryImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/EnumerationImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LambdaRefImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/LiteralImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MethodCallImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/TypeLiteralImpl.java diff --git a/odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java rename to lib/server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/UnaryImpl.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmActionImportImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmComplexTypeImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityContainerImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntitySetImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEntityTypeImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmEnumTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmFunctionImportImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmKeyPropertyRefImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmMemberImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmMemberImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmMemberImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmMemberImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNamedImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNamedImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNamedImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNamedImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmNavigationPropertyImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmParameterImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmPropertyImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplOverloadingTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplOverloadingTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplOverloadingTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplOverloadingTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmProviderImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmReturnTypeImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmServiceMetadataImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmSingletonImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeDefinitionImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/EdmTypeImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/PrimitiveTypeBaseTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/PrimitiveTypeBaseTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/PrimitiveTypeBaseTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/edm/provider/PrimitiveTypeBaseTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechProvider.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/EdmTechTestProvider.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriResourceImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriResourceImplTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriResourceImplTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriResourceImplTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ExpandValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ExpandValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ExpandValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ExpandValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterTreeToText.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterTreeToText.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterTreeToText.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterTreeToText.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/FilterValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParseTreeToText.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParseTreeToText.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParseTreeToText.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParseTreeToText.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserWithLogging.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserWithLogging.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserWithLogging.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ParserWithLogging.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ResourceValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ResourceValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ResourceValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/ResourceValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TestErrorLogger.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TestErrorLogger.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TestErrorLogger.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TestErrorLogger.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TokenValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TokenValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TokenValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/TokenValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriLexerWithTrace.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriLexerWithTrace.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriLexerWithTrace.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriLexerWithTrace.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriValidator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriValidator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriValidator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/UriValidator.java diff --git a/odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/Validator.java b/lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/Validator.java similarity index 100% rename from odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/Validator.java rename to lib/server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/testutil/Validator.java diff --git a/pom.xml b/pom.xml index 24239b2d6..d9602f9e4 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,8 @@ - odata4-lib - odata4-fit + lib + fit