Renamed jaxb-api directory to api. (#198)

Signed-off-by: Tomas Kraus <tomas.kraus@oracle.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff04a2c..afeb62a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-[//]: # " Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. "
+[//]: # " Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. "
 [//]: # "  "
 [//]: # " This program and the accompanying materials are made available under the "
 [//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at "
diff --git a/NOTICE.md b/NOTICE.md
index 101193f..84596db 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,4 +1,4 @@
-[//]: # " Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. "
+[//]: # " Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. "
 [//]: # "  "
 [//]: # " This program and the accompanying materials are made available under the "
 [//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at "
diff --git a/README.md b/README.md
index d93338f..90878d7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[//]: # " Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. "
+[//]: # " Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. "
 [//]: # "  "
 [//]: # " This program and the accompanying materials are made available under the "
 [//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at "
diff --git a/jaxb-api/exclude.xml b/api/exclude.xml
similarity index 94%
rename from jaxb-api/exclude.xml
rename to api/exclude.xml
index 40a4ab1..ceb087f 100644
--- a/jaxb-api/exclude.xml
+++ b/api/exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/pom.xml b/api/pom.xml
similarity index 100%
rename from jaxb-api/pom.xml
rename to api/pom.xml
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Binder.java b/api/src/main/java/jakarta/xml/bind/Binder.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/Binder.java
rename to api/src/main/java/jakarta/xml/bind/Binder.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java b/api/src/main/java/jakarta/xml/bind/ContextFinder.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java
rename to api/src/main/java/jakarta/xml/bind/ContextFinder.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java b/api/src/main/java/jakarta/xml/bind/DataBindingException.java
similarity index 92%
rename from jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
rename to api/src/main/java/jakarta/xml/bind/DataBindingException.java
index 062352a..ba90222 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
+++ b/api/src/main/java/jakarta/xml/bind/DataBindingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java b/api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
similarity index 99%
rename from jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
rename to api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
index 89ffd77..27549e4 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
+++ b/api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java b/api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
rename to api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java b/api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
similarity index 99%
rename from jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
rename to api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
index f5da27e..e9dde84 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
+++ b/api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Element.java b/api/src/main/java/jakarta/xml/bind/Element.java
similarity index 93%
rename from jaxb-api/src/main/java/jakarta/xml/bind/Element.java
rename to api/src/main/java/jakarta/xml/bind/Element.java
index 9dd6b78..110a9e3 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/Element.java
+++ b/api/src/main/java/jakarta/xml/bind/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/GetPropertyAction.java b/api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
rename to api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java b/api/src/main/java/jakarta/xml/bind/JAXB.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
rename to api/src/main/java/jakarta/xml/bind/JAXB.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java b/api/src/main/java/jakarta/xml/bind/JAXBContext.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java
rename to api/src/main/java/jakarta/xml/bind/JAXBContext.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java b/api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
rename to api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
index b9e87a0..6a1cfc1 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
+++ b/api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBElement.java b/api/src/main/java/jakarta/xml/bind/JAXBElement.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBElement.java
rename to api/src/main/java/jakarta/xml/bind/JAXBElement.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBException.java b/api/src/main/java/jakarta/xml/bind/JAXBException.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBException.java
rename to api/src/main/java/jakarta/xml/bind/JAXBException.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java b/api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
rename to api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java b/api/src/main/java/jakarta/xml/bind/JAXBPermission.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java
rename to api/src/main/java/jakarta/xml/bind/JAXBPermission.java
index 1a5d3cf..7f9c641 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java
+++ b/api/src/main/java/jakarta/xml/bind/JAXBPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java b/api/src/main/java/jakarta/xml/bind/MarshalException.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java
rename to api/src/main/java/jakarta/xml/bind/MarshalException.java
index 0556b02..8e1b6d4 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java
+++ b/api/src/main/java/jakarta/xml/bind/MarshalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java b/api/src/main/java/jakarta/xml/bind/Marshaller.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java
rename to api/src/main/java/jakarta/xml/bind/Marshaller.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Messages.java b/api/src/main/java/jakarta/xml/bind/Messages.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/Messages.java
rename to api/src/main/java/jakarta/xml/bind/Messages.java
index 507de8a..2d04b09 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/Messages.java
+++ b/api/src/main/java/jakarta/xml/bind/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ModuleUtil.java b/api/src/main/java/jakarta/xml/bind/ModuleUtil.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ModuleUtil.java
rename to api/src/main/java/jakarta/xml/bind/ModuleUtil.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java b/api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
rename to api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java b/api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
similarity index 92%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
rename to api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
index 30f02d7..c0394b6 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
+++ b/api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java b/api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
similarity index 92%
rename from jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
rename to api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
index 0937a62..0373dd4 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
+++ b/api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java b/api/src/main/java/jakarta/xml/bind/PropertyException.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java
rename to api/src/main/java/jakarta/xml/bind/PropertyException.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java b/api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
rename to api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java b/api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
rename to api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/TypeConstraintException.java b/api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
rename to api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java b/api/src/main/java/jakarta/xml/bind/UnmarshalException.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java
rename to api/src/main/java/jakarta/xml/bind/UnmarshalException.java
index 7a181c6..7422013 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java
+++ b/api/src/main/java/jakarta/xml/bind/UnmarshalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Unmarshaller.java b/api/src/main/java/jakarta/xml/bind/Unmarshaller.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/Unmarshaller.java
rename to api/src/main/java/jakarta/xml/bind/Unmarshaller.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java b/api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
rename to api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
index dbf455c..4228437 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
+++ b/api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEvent.java b/api/src/main/java/jakarta/xml/bind/ValidationEvent.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ValidationEvent.java
rename to api/src/main/java/jakarta/xml/bind/ValidationEvent.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java b/api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
rename to api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java b/api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
rename to api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/ValidationException.java b/api/src/main/java/jakarta/xml/bind/ValidationException.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/ValidationException.java
rename to api/src/main/java/jakarta/xml/bind/ValidationException.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java b/api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
rename to api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
index 6e0a14c..6119fd8 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
+++ b/api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java b/api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
rename to api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
index dac01db..91fccfe 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java b/api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
rename to api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
similarity index 93%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
index 6ce3dd5..f40eadb 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
index d7f9596..c0e42e6 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
index 3e1605c..3999f11 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
index a950c12..87cb24d 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
index 002255d..c66a2b1 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
index 4812d8d..8ca5b51 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
index 7b012fd..746d413 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
similarity index 95%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
index 5b66cf2..39e124a 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
index 57aa28b..949cb59 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
index 2e0b7c6..3febf01 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
index 1bed7e0..7a67fb7 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
index 6d92e14..a139f12 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
index 2e67f73..2b68e12 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
index 31db384..9b22e46 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
index 4e1c0ee..2d59db6 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
index 9683521..85b0912 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
similarity index 95%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
index f869915..e57835e 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
index d29b5ef..a53496a 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
similarity index 94%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
index 2e4f5ec..835bac2 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
similarity index 95%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
index 92cbbd7..38e6e2f 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
similarity index 92%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
index a8d6a42..4301867 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
index 33804ae..14fd21a 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
index b660a93..95d0fd4 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
similarity index 95%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
index 42d0f91..1efffc7 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
index 7492beb..c0eca4b 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlType.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
rename to api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
index f379e89..f24c015 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
index 9ef60a4..926338b 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
similarity index 95%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
index 273da47..dfe0607 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java b/api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
similarity index 94%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
rename to api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
index 305aa31..d1f10bb 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java b/api/src/main/java/jakarta/xml/bind/annotation/package-info.java
similarity index 99%
rename from jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java
rename to api/src/main/java/jakarta/xml/bind/annotation/package-info.java
index d47bf5c..a016cff 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/annotation/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
rename to api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
rename to api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java b/api/src/main/java/jakarta/xml/bind/attachment/package-info.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java
rename to api/src/main/java/jakarta/xml/bind/attachment/package-info.java
index cf0b1d9..c163a2e 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/attachment/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java b/api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
rename to api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java b/api/src/main/java/jakarta/xml/bind/helpers/Messages.java
similarity index 97%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java
rename to api/src/main/java/jakarta/xml/bind/helpers/Messages.java
index 66967ae..2b5ad09 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java
+++ b/api/src/main/java/jakarta/xml/bind/helpers/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java b/api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
rename to api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java b/api/src/main/java/jakarta/xml/bind/helpers/package-info.java
similarity index 94%
rename from jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java
rename to api/src/main/java/jakarta/xml/bind/helpers/package-info.java
index d7314d4..1e4612b 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/helpers/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/package-info.java b/api/src/main/java/jakarta/xml/bind/package-info.java
similarity index 94%
rename from jaxb-api/src/main/java/jakarta/xml/bind/package-info.java
rename to api/src/main/java/jakarta/xml/bind/package-info.java
index b1b83f6..36480ae 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java b/api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
similarity index 98%
rename from jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
rename to api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
index 7a62338..249cc04 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
+++ b/api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBSource.java b/api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
rename to api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java b/api/src/main/java/jakarta/xml/bind/util/Messages.java
similarity index 96%
rename from jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java
rename to api/src/main/java/jakarta/xml/bind/util/Messages.java
index 65c0f58..ce7db2e 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java
+++ b/api/src/main/java/jakarta/xml/bind/util/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java b/api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
similarity index 100%
rename from jaxb-api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
rename to api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java b/api/src/main/java/jakarta/xml/bind/util/package-info.java
similarity index 93%
rename from jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java
rename to api/src/main/java/jakarta/xml/bind/util/package-info.java
index 2f4971b..3a3195a 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java
+++ b/api/src/main/java/jakarta/xml/bind/util/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/java/module-info.java b/api/src/main/java/module-info.java
similarity index 92%
rename from jaxb-api/src/main/java/module-info.java
rename to api/src/main/java/module-info.java
index 5f0e2fd..e6a54b9 100644
--- a/jaxb-api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/javadoc/doc-files/speclicense.html b/api/src/main/javadoc/doc-files/speclicense.html
similarity index 100%
rename from jaxb-api/src/main/javadoc/doc-files/speclicense.html
rename to api/src/main/javadoc/doc-files/speclicense.html
diff --git a/jaxb-api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java b/api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
similarity index 100%
rename from jaxb-api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
rename to api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties b/api/src/main/resources/jakarta/xml/bind/Messages.properties
similarity index 95%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties
rename to api/src/main/resources/jakarta/xml/bind/Messages.properties
index dc6180b..00b1a6f 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties
+++ b/api/src/main/resources/jakarta/xml/bind/Messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,6 +8,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+
 ContextFinder.ProviderNotFound = \
 	Provider {0} not found
 
diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd b/api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd
similarity index 99%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd
rename to api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd
index fce7d09..cea2bc3 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd
+++ b/api/src/main/resources/jakarta/xml/bind/bindingschema_1_0.xsd
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
 <!--
 
-    Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd b/api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd
similarity index 99%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd
rename to api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd
index 7d73c8a..e1b67a2 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd
+++ b/api/src/main/resources/jakarta/xml/bind/bindingschema_2_0.xsd
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8"?>

 <!--

 

-    Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.

+    Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.

 

     This program and the accompanying materials are made available under the

     terms of the Eclipse Distribution License v. 1.0, which is available at

diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd b/api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd
similarity index 99%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd
rename to api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd
index 52dd500..78b8750 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd
+++ b/api/src/main/resources/jakarta/xml/bind/bindingschema_3_0.xsd
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
 <!--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties b/api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
similarity index 93%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
rename to api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
index 695f34e..a46de23 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
+++ b/api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,6 +8,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+
 AbstractUnmarshallerImpl.ISNotNull = \
 	InputStream can not be null
 
diff --git a/jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties b/api/src/main/resources/jakarta/xml/bind/util/Messages.properties
similarity index 90%
rename from jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties
rename to api/src/main/resources/jakarta/xml/bind/util/Messages.properties
index 069cdb8..8cc5c4e 100644
--- a/jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties
+++ b/api/src/main/resources/jakarta/xml/bind/util/Messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,6 +8,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+
 ValidationEventCollector.UnrecognizedSeverity = \
 	Unrecognized event severity field "{0}"
 	
diff --git a/etc/jenkins/continuous.groovy b/etc/jenkins/continuous.groovy
index 8055c92..7684769 100644
--- a/etc/jenkins/continuous.groovy
+++ b/etc/jenkins/continuous.groovy
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/etc/jenkins/release.groovy b/etc/jenkins/release.groovy
index 104dd57..07b1302 100644
--- a/etc/jenkins/release.groovy
+++ b/etc/jenkins/release.groovy
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/pom.xml b/pom.xml
index 89e5138..e9d395c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
     </properties>
 
     <modules>
-        <module>jaxb-api</module>
+        <module>api</module>
     </modules>
 
     <dependencyManagement>