Merge branch 'development'v1.6.1

39 files changed, 236 insertions, 301 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 258601a..9285790 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,6 @@ jobs:
       uses: nick-fields/retry@v2
       with:
         timeout_minutes: 60
-        max_attempts: 3
+        max_attempts: 1
         command: mvn --batch-mode verify -Dmaven.javadoc.skip=true
         on_retry_command: mvn --batch-mode clean
diff --git a/LICENSE b/LICENSE
index 94a9ed0..f288702 100644..100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 86240c0..cdff9f3 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,16 @@
-[maven-img]: https://img.shields.io/maven-central/v/com.github.markozajc/akiwrapper.svg?label=Maven%20Central
-[maven]: https://mvnrepository.com/artifact/com.github.markozajc/akiwrapper
+[maven-img]: https://img.shields.io/maven-central/v/org.eu.zajc/akiwrapper.svg?label=Maven%20Central
+[maven]: https://mvnrepository.com/artifact/org.eu.zajc/akiwrapper
 
 [build-img]: https://github.com/markozajc/Akiwrapper/actions/workflows/test.yml/badge.svg?branch=master
 [build]: https://github.com/markozajc/Akiwrapper/actions/workflows/test.yml?query=branch%3Amaster
 
+> **Warning**\
+> **Relocation notice for 1.6.1 and above:**\
+> Akiwrapper's artifact has relocated from `com.github.markozajc:akiwrapper` to `org.eu.zajc:akiwrapper`. Additionally,
+> the same change has been made on the base package name. You will need to change Akiwrapper's dependency's `groupId`
+> in your pom.xml or build.gradle (as shown in the installation section) and you will need to replace
+> `com.github.markozajc.akiwrapper` with `org.eu.zajc.akiwrapper` in your imports.
+
 # Akiwrapper [![Maven central emblem][maven-img]][maven] [![Build status][build-img]][build]
 Akiwrapper is a Java API wrapper for [Akinator](https://en.akinator.com/), the popular online
 [20Q-type](https://en.wikipedia.org/wiki/Twenty_questions) game.
@@ -13,15 +20,15 @@ Akiwrapper is a Java API wrapper for [Akinator](https://en.akinator.com/), the p
 Add the following dependency to your pom.xml:
 ```xml
 <dependency>
-    <groupId>com.github.markozajc</groupId>
+    <groupId>org.eu.zajc</groupId>
     <artifactId>akiwrapper</artifactId>
-    <version>1.6</version>
+    <version>1.6.1</version>
 </dependency>
 ```
 #### Gradle
 Add the following dependency to your build.gradle:
 ```gradle
-implementation group: 'com.github.markozajc', name: 'akiwrapper', version: '1.6'
+implementation group: 'org.eu.zajc', name: 'akiwrapper', version: '1.6.1'
 ```
 
 ## Usage
diff --git a/example/pom.xml b/example/pom.xml
index 700a0dd..0699db4 100755
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -57,7 +57,7 @@
                                                 <configuration>
                                                         <transformers>
                                                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                                                        <mainClass>zajc.akiwrapper.AkinatorExample</mainClass>
+                                                                        <mainClass>org.eu.zajc.akiwrapper.example.AkinatorExample</mainClass>
                                                                 </transformer>
                                                         </transformers>
                                                         <createDependencyReducedPom>false</createDependencyReducedPom>
@@ -72,9 +72,9 @@
 
         <dependencies>
                 <dependency>
-                        <groupId>com.github.markozajc</groupId>
+                        <groupId>org.eu.zajc</groupId>
                         <artifactId>akiwrapper</artifactId>
-                        <version>1.6</version>
+                        <version>1.6.1</version>
                 </dependency>
         </dependencies>
 
diff --git a/example/src/main/java/zajc/akiwrapper/AkinatorExample.java b/example/src/main/java/org/eu/zajc/akiwrapper/example/AkinatorExample.java
index 0a903e6..569e439 100644
--- a/example/src/main/java/zajc/akiwrapper/AkinatorExample.java
+++ b/example/src/main/java/org/eu/zajc/akiwrapper/example/AkinatorExample.java
@@ -1,20 +1,20 @@
-package zajc.akiwrapper;
+package org.eu.zajc.akiwrapper.example;
 
-import static com.github.markozajc.akiwrapper.Akiwrapper.Answer.*;
-import static com.github.markozajc.akiwrapper.core.entities.Server.GuessType.CHARACTER;
-import static com.github.markozajc.akiwrapper.core.entities.Server.Language.ENGLISH;
 import static java.lang.Character.toLowerCase;
 import static java.lang.System.*;
 import static java.util.stream.Collectors.joining;
+import static org.eu.zajc.akiwrapper.Akiwrapper.Answer.*;
+import static org.eu.zajc.akiwrapper.core.entities.Server.GuessType.CHARACTER;
+import static org.eu.zajc.akiwrapper.core.entities.Server.Language.ENGLISH;
 
 import java.util.*;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.*;
-import com.github.markozajc.akiwrapper.core.entities.*;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
-import com.github.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;
+import org.eu.zajc.akiwrapper.*;
+import org.eu.zajc.akiwrapper.core.entities.*;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.exceptions.ServerNotFoundException;
 
 @SuppressWarnings("javadoc")
 public class AkinatorExample {
diff --git a/pom.xml b/pom.xml
index 6a938c7..f8960ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <modelVersion>4.0.0</modelVersion>
 
-        <groupId>com.github.markozajc</groupId>
+        <groupId>org.eu.zajc</groupId>
         <artifactId>akiwrapper</artifactId>
-        <version>1.6.0-1</version>
+        <version>1.6.1</version>
 
         <name>Akiwrapper</name>
         <description>A Java API wrapper for Akinator</description>
@@ -132,10 +132,9 @@
                         <plugin>
                                 <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-enforcer-plugin</artifactId>
-                                <version>3.1.0</version>
+                                <version>3.3.0</version>
                                 <executions>
                                         <execution>
-                                                <id>enforce-maven</id>
                                                 <goals>
                                                         <goal>enforce</goal>
                                                 </goals>
@@ -152,11 +151,12 @@
 
                         <!-- Javadoc -->
                         <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-javadoc-plugin</artifactId>
-                                <version>3.4.0</version>
+                                <version>3.5.0</version>
                                 <executions>
                                         <execution>
-                                                <id>attach-javadocs</id>
+                                                <phase>verify</phase>
                                                 <goals>
                                                         <goal>jar</goal>
                                                 </goals>
@@ -170,10 +170,10 @@
                         <!-- Unit tests -->
                         <plugin>
                                 <artifactId>maven-surefire-plugin</artifactId>
-                                <version>2.22.2</version>
+                                <version>3.1.2</version>
                                 <executions>
                                         <execution>
-                                                <id>test</id>
+                                                <phase>test</phase>
                                                 <goals>
                                                         <goal>test</goal>
                                                 </goals>
@@ -185,7 +185,7 @@
                         <plugin>
                                 <groupId>org.codehaus.mojo</groupId>
                                 <artifactId>versions-maven-plugin</artifactId>
-                                <version>2.11.0</version>
+                                <version>2.16.0</version>
                                 <configuration>
                                         <rulesUri>file://${project.basedir}/versions-ruleset.xml</rulesUri>
                                 </configuration>
@@ -204,10 +204,9 @@
                                         <plugin>
                                                 <groupId>org.apache.maven.plugins</groupId>
                                                 <artifactId>maven-source-plugin</artifactId>
-                                                <version>3.2.1</version>
+                                                <version>3.3.0</version>
                                                 <executions>
                                                         <execution>
-                                                                <id>attach-sources</id>
                                                                 <goals>
                                                                         <goal>jar</goal>
                                                                 </goals>
@@ -219,10 +218,9 @@
                                         <plugin>
                                                 <groupId>org.apache.maven.plugins</groupId>
                                                 <artifactId>maven-gpg-plugin</artifactId>
-                                                <version>3.0.1</version>
+                                                <version>3.1.0</version>
                                                 <executions>
                                                         <execution>
-                                                                <id>sign-artifacts</id>
                                                                 <phase>verify</phase>
                                                                 <goals>
                                                                         <goal>sign</goal>
@@ -238,8 +236,8 @@
                                                 <version>1.6.13</version>
                                                 <extensions>true</extensions>
                                                 <configuration>
-                                                        <serverId>ossrh</serverId>
-                                                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                                                        <serverId>${nexus.serverid}</serverId>
+                                                        <nexusUrl>${nexus.url}</nexusUrl>
                                                         <autoReleaseAfterClose>false</autoReleaseAfterClose>
                                                 </configuration>
                                         </plugin>
diff --git a/src/main/java/com/github/markozajc/akiwrapper/Akiwrapper.java b/src/main/java/org/eu/zajc/akiwrapper/Akiwrapper.java
index d924cc8..c2e9a8b 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/Akiwrapper.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/Akiwrapper.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper;
+package org.eu.zajc.akiwrapper;
 
 import static java.util.stream.Collectors.toList;
 
@@ -25,9 +23,9 @@ import java.util.List;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.core.entities.*;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
-import com.github.markozajc.akiwrapper.core.exceptions.*;
+import org.eu.zajc.akiwrapper.core.entities.*;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.exceptions.*;
 
 /**
  * The "core" of interaction with the Akinator's API.<br>
diff --git a/src/main/java/com/github/markozajc/akiwrapper/AkiwrapperBuilder.java b/src/main/java/org/eu/zajc/akiwrapper/AkiwrapperBuilder.java
index 8bb5ed4..e738b59 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/AkiwrapperBuilder.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/AkiwrapperBuilder.java
@@ -3,36 +3,33 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper;
+package org.eu.zajc.akiwrapper;
 
-import static com.github.markozajc.akiwrapper.core.entities.Server.GuessType.CHARACTER;
-import static com.github.markozajc.akiwrapper.core.entities.Server.Language.ENGLISH;
-import static com.github.markozajc.akiwrapper.core.utils.Servers.findServers;
 import static java.lang.String.format;
+import static org.eu.zajc.akiwrapper.core.entities.Server.GuessType.CHARACTER;
+import static org.eu.zajc.akiwrapper.core.entities.Server.Language.ENGLISH;
+import static org.eu.zajc.akiwrapper.core.utils.Servers.findServers;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.core.entities.*;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.exceptions.*;
+import org.eu.zajc.akiwrapper.core.impl.AkiwrapperImpl;
+import org.eu.zajc.akiwrapper.core.utils.UnirestUtils;
 import org.slf4j.*;
 
-import com.github.markozajc.akiwrapper.core.entities.*;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
-import com.github.markozajc.akiwrapper.core.exceptions.*;
-import com.github.markozajc.akiwrapper.core.impl.AkiwrapperImpl;
-import com.github.markozajc.akiwrapper.core.utils.UnirestUtils;
-
 import kong.unirest.UnirestInstance;
 
 /**
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Guess.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Guess.java
index fb420d4..730dfbf 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Guess.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Guess.java
@@ -3,27 +3,25 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import java.net.URL;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.*;
-import com.github.markozajc.akiwrapper.core.entities.Server.GuessType;
+import org.eu.zajc.akiwrapper.*;
+import org.eu.zajc.akiwrapper.core.entities.Server.GuessType;
 
 /**
  * A representation of Akinator's guess. A guess may span different types of subject,
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Identifiable.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Identifiable.java
index 995950a..273ac83 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Identifiable.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Identifiable.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Question.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Question.java
index 7a36857..44160c6 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Question.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Question.java
@@ -3,25 +3,23 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.Akiwrapper.Answer;
-import com.github.markozajc.akiwrapper.AkiwrapperBuilder;
+import org.eu.zajc.akiwrapper.Akiwrapper.Answer;
+import org.eu.zajc.akiwrapper.AkiwrapperBuilder;
 
 /**
  * A representation of Akinator's question that is to be answered with an
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Server.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Server.java
index 1a4081b..168ad43 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Server.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Server.java
@@ -3,24 +3,22 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.core.utils.Servers;
+import org.eu.zajc.akiwrapper.core.utils.Servers;
 
 import kong.unirest.UnirestInstance;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Status.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Status.java
index 724dc17..28820c5 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/Status.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/Status.java
@@ -3,26 +3,24 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import java.io.Serializable;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.core.exceptions.ServerStatusException;
+import org.eu.zajc.akiwrapper.core.exceptions.ServerStatusException;
 
 /**
  * An interface used to represent API call's completion status.
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/GuessImpl.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/GuessImpl.java
index 7f416ed..a5ec4c1 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/GuessImpl.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/GuessImpl.java
@@ -3,32 +3,30 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities.impl;
 
-import static com.github.markozajc.akiwrapper.core.utils.JSONUtils.*;
+package org.eu.zajc.akiwrapper.core.entities.impl;
+
 import static java.lang.Double.compare;
+import static org.eu.zajc.akiwrapper.core.utils.JSONUtils.*;
 
 import java.net.*;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.core.entities.Guess;
 import org.json.JSONObject;
 
-import com.github.markozajc.akiwrapper.core.entities.Guess;
-
 /**
  * <b>Note:</b> This is an internal class and its internals are subject to change
  * without prior deprecation. Use with caution.<br>
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/QuestionImpl.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/QuestionImpl.java
index bb85a28..5a8bd02 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/QuestionImpl.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/QuestionImpl.java
@@ -3,29 +3,26 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities.impl;
+package org.eu.zajc.akiwrapper.core.entities.impl;
 
-import static com.github.markozajc.akiwrapper.core.utils.JSONUtils.*;
+import static org.eu.zajc.akiwrapper.core.utils.JSONUtils.*;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.core.entities.Question;
 import org.json.JSONObject;
 
-import com.github.markozajc.akiwrapper.core.entities.Question;
-
 /**
  * <b>Note:</b> This is an internal class and its internals are subject to change
  * without prior deprecation. Use with caution.<br>
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/ServerImpl.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/ServerImpl.java
index c376bec..aedd43f 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/ServerImpl.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/ServerImpl.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities.impl;
+package org.eu.zajc.akiwrapper.core.entities.impl;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -26,7 +24,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.core.entities.Server;
+import org.eu.zajc.akiwrapper.core.entities.Server;
+
 import com.jcabi.xml.XML;
 
 /**
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/StatusImpl.java b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/StatusImpl.java
index 0aaf6fa..4c05285 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/entities/impl/StatusImpl.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/entities/impl/StatusImpl.java
@@ -3,29 +3,26 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities.impl;
+package org.eu.zajc.akiwrapper.core.entities.impl;
 
-import static com.github.markozajc.akiwrapper.core.entities.Status.Reason.UNKNOWN;
+import static org.eu.zajc.akiwrapper.core.entities.Status.Reason.UNKNOWN;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.core.entities.Status;
 import org.json.JSONObject;
 
-import com.github.markozajc.akiwrapper.core.entities.Status;
-
 /**
  * <b>Note:</b> This is an internal class and its internals are subject to change
  * without prior deprecation. Use with caution.<br>
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/AkinatorException.java b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/AkinatorException.java
index 52f3dc3..d776678 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/AkinatorException.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/AkinatorException.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.exceptions;
+package org.eu.zajc.akiwrapper.core.exceptions;
 
 import javax.annotation.*;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/QuestionsExhaustedException.java b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/QuestionsExhaustedException.java
index a592932..7b9a342 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/QuestionsExhaustedException.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/QuestionsExhaustedException.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.exceptions;
+package org.eu.zajc.akiwrapper.core.exceptions;
 
 /**
  * An exception indicating that there is no question left to answer or fetch.
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/ServerNotFoundException.java
index cfb3733..516e95e 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/ServerNotFoundException.java
@@ -3,25 +3,23 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.exceptions;
+package org.eu.zajc.akiwrapper.core.exceptions;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.core.entities.Server;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.entities.Server;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
 
 /**
  * An exception indicating that no {@link Server} could be found for the given
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/ServerStatusException.java b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/ServerStatusException.java
index 7dcdd28..790f247 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/ServerStatusException.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/ServerStatusException.java
@@ -3,23 +3,21 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.exceptions;
+package org.eu.zajc.akiwrapper.core.exceptions;
 
-import com.github.markozajc.akiwrapper.core.entities.Status;
-import com.github.markozajc.akiwrapper.core.entities.Status.Level;
+import org.eu.zajc.akiwrapper.core.entities.Status;
+import org.eu.zajc.akiwrapper.core.entities.Status.Level;
 
 import kong.unirest.HttpResponse;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/UndoOutOfBoundsException.java b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/UndoOutOfBoundsException.java
index da4c108..e3e706e 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/exceptions/UndoOutOfBoundsException.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/exceptions/UndoOutOfBoundsException.java
@@ -3,22 +3,20 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.exceptions;
+package org.eu.zajc.akiwrapper.core.exceptions;
 
-import com.github.markozajc.akiwrapper.Akiwrapper;
+import org.eu.zajc.akiwrapper.Akiwrapper;
 
 /**
  * An exception indicating that {@link Akiwrapper#undoAnswer()} has been called on
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/impl/AkiwrapperImpl.java b/src/main/java/org/eu/zajc/akiwrapper/core/impl/AkiwrapperImpl.java
index a3059ec..32b47c6 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/impl/AkiwrapperImpl.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/impl/AkiwrapperImpl.java
@@ -3,28 +3,26 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.impl;
+package org.eu.zajc.akiwrapper.core.impl;
 
-import static com.github.markozajc.akiwrapper.core.entities.Status.Reason.QUESTIONS_EXHAUSTED;
-import static com.github.markozajc.akiwrapper.core.utils.route.Routes.*;
 import static java.lang.Integer.parseInt;
 import static java.lang.Long.parseLong;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toUnmodifiableList;
 import static java.util.stream.StreamSupport.stream;
+import static org.eu.zajc.akiwrapper.core.entities.Status.Reason.QUESTIONS_EXHAUSTED;
+import static org.eu.zajc.akiwrapper.core.utils.route.Routes.*;
 
 import java.util.List;
 
@@ -32,15 +30,14 @@ import javax.annotation.Nonnull;
 
 import org.eclipse.collections.api.factory.primitive.LongSets;
 import org.eclipse.collections.api.set.primitive.MutableLongSet;
+import org.eu.zajc.akiwrapper.Akiwrapper;
+import org.eu.zajc.akiwrapper.core.entities.*;
+import org.eu.zajc.akiwrapper.core.entities.impl.*;
+import org.eu.zajc.akiwrapper.core.exceptions.*;
+import org.eu.zajc.akiwrapper.core.utils.ApiKey;
 import org.json.JSONObject;
 import org.slf4j.*;
 
-import com.github.markozajc.akiwrapper.Akiwrapper;
-import com.github.markozajc.akiwrapper.core.entities.*;
-import com.github.markozajc.akiwrapper.core.entities.impl.*;
-import com.github.markozajc.akiwrapper.core.exceptions.*;
-import com.github.markozajc.akiwrapper.core.utils.ApiKey;
-
 import kong.unirest.UnirestInstance;
 
 /**
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/ApiKey.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/ApiKey.java
index 002a309..c070cb4 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/ApiKey.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/ApiKey.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -27,7 +25,7 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.core.utils.route.Route;
+import org.eu.zajc.akiwrapper.core.utils.route.Route;
 
 import kong.unirest.UnirestInstance;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/JSONUtils.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/JSONUtils.java
index fb1a649..57fa1a3 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/JSONUtils.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/JSONUtils.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
 import static java.lang.Double.parseDouble;
 import static java.lang.Integer.parseInt;
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/Servers.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/Servers.java
index 68d4f77..0694f5c 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/Servers.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/Servers.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
 import static java.util.stream.Collectors.toList;
 
@@ -25,9 +23,10 @@ import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.core.entities.Server;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
-import com.github.markozajc.akiwrapper.core.entities.impl.ServerImpl;
+import org.eu.zajc.akiwrapper.core.entities.Server;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.entities.impl.ServerImpl;
+
 import com.jcabi.xml.XMLDocument;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/UnirestUtils.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/UnirestUtils.java
index fef9350..0afcee1 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/UnirestUtils.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/UnirestUtils.java
@@ -3,27 +3,25 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
-import static com.github.markozajc.akiwrapper.core.utils.WorkaroundUtils.workaroundIncompleteChain;
 import static kong.unirest.Unirest.spawnInstance;
+import static org.eu.zajc.akiwrapper.core.utils.WorkaroundUtils.workaroundIncompleteChain;
 
 import javax.annotation.Nonnull;
 
-import com.github.markozajc.akiwrapper.AkiwrapperBuilder;
+import org.eu.zajc.akiwrapper.AkiwrapperBuilder;
 
 import kong.unirest.UnirestInstance;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/Utilities.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/Utilities.java
index 8c7e29e..09ac511 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/Utilities.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/Utilities.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
 import static java.lang.Thread.*;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/WorkaroundUtils.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/WorkaroundUtils.java
index 04b033a..6222ef9 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/WorkaroundUtils.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/WorkaroundUtils.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
 import static java.util.Arrays.stream;
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Request.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Request.java
index 6d95a3b..6c6753f 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Request.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Request.java
@@ -3,39 +3,36 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils.route;
+package org.eu.zajc.akiwrapper.core.utils.route;
 
-import static com.github.markozajc.akiwrapper.core.entities.Status.Level.ERROR;
-import static com.github.markozajc.akiwrapper.core.utils.Utilities.sleepUnchecked;
-import static com.github.markozajc.akiwrapper.core.utils.route.Route.*;
 import static java.lang.String.format;
 import static java.time.Duration.ofSeconds;
 import static java.util.stream.Collectors.joining;
+import static org.eu.zajc.akiwrapper.core.entities.Status.Level.ERROR;
+import static org.eu.zajc.akiwrapper.core.utils.Utilities.sleepUnchecked;
+import static org.eu.zajc.akiwrapper.core.utils.route.Route.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.*;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.core.entities.impl.StatusImpl;
+import org.eu.zajc.akiwrapper.core.exceptions.*;
 import org.json.*;
 import org.slf4j.Logger;
 
-import com.github.markozajc.akiwrapper.core.entities.impl.StatusImpl;
-import com.github.markozajc.akiwrapper.core.exceptions.*;
-
 import kong.unirest.*;
 
 @SuppressWarnings("javadoc") // internal util
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Response.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Response.java
index e6aa7ec..2d3a10a 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Response.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Response.java
@@ -3,27 +3,24 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils.route;
+package org.eu.zajc.akiwrapper.core.utils.route;
 
 import javax.annotation.Nonnull;
 
+import org.eu.zajc.akiwrapper.core.entities.Status;
 import org.json.JSONObject;
 
-import com.github.markozajc.akiwrapper.core.entities.Status;
-
 @SuppressWarnings("javadoc") // internal util
 public class Response {
 
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Route.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Route.java
index 69029cb..eb12dd6 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Route.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Route.java
@@ -3,25 +3,23 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils.route;
+package org.eu.zajc.akiwrapper.core.utils.route;
 
-import static com.github.markozajc.akiwrapper.core.utils.route.Route.Endpoint.GAME_SERVER;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
+import static org.eu.zajc.akiwrapper.core.utils.route.Route.Endpoint.GAME_SERVER;
 
 import java.net.URLEncoder;
 import java.util.*;
@@ -29,7 +27,7 @@ import java.util.function.Supplier;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.core.impl.AkiwrapperImpl;
+import org.eu.zajc.akiwrapper.core.impl.AkiwrapperImpl;
 
 @SuppressWarnings("javadoc") // internal util
 public final class Route {
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/RouteBuilder.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/RouteBuilder.java
index 5ed37a2..c15103d 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/RouteBuilder.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/RouteBuilder.java
@@ -3,31 +3,29 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils.route;
+package org.eu.zajc.akiwrapper.core.utils.route;
 
-import static com.github.markozajc.akiwrapper.core.utils.route.Route.formatParameters;
-import static com.github.markozajc.akiwrapper.core.utils.route.Route.Endpoint.GAME_SERVER;
 import static java.lang.System.currentTimeMillis;
+import static org.eu.zajc.akiwrapper.core.utils.route.Route.formatParameters;
+import static org.eu.zajc.akiwrapper.core.utils.route.Route.Endpoint.GAME_SERVER;
 
 import java.util.*;
 import java.util.function.Supplier;
 
 import javax.annotation.*;
 
-import com.github.markozajc.akiwrapper.core.utils.route.Route.Endpoint;
+import org.eu.zajc.akiwrapper.core.utils.route.Route.Endpoint;
 
 @SuppressWarnings("javadoc") // internal util
 public class RouteBuilder {
diff --git a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Routes.java b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Routes.java
index 4f1fd19..5ddd0e5 100644
--- a/src/main/java/com/github/markozajc/akiwrapper/core/utils/route/Routes.java
+++ b/src/main/java/org/eu/zajc/akiwrapper/core/utils/route/Routes.java
@@ -3,22 +3,20 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils.route;
+package org.eu.zajc.akiwrapper.core.utils.route;
 
-import static com.github.markozajc.akiwrapper.core.utils.route.Route.Endpoint.*;
+import static org.eu.zajc.akiwrapper.core.utils.route.Route.Endpoint.*;
 
 @SuppressWarnings("javadoc") // internal util
 public final class Routes {
diff --git a/src/test/java/com/github/markozajc/akiwrapper/IntegrationTest.java b/src/test/java/org/eu/zajc/akiwrapper/IntegrationTest.java
index 86bdfa0..f9abb14 100644
--- a/src/test/java/com/github/markozajc/akiwrapper/IntegrationTest.java
+++ b/src/test/java/org/eu/zajc/akiwrapper/IntegrationTest.java
@@ -3,23 +3,21 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper;
+package org.eu.zajc.akiwrapper;
 
-import static com.github.markozajc.akiwrapper.Akiwrapper.Answer.YES;
 import static java.lang.String.format;
+import static org.eu.zajc.akiwrapper.Akiwrapper.Answer.YES;
 import static org.junit.jupiter.api.Assumptions.abort;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -28,16 +26,15 @@ import java.util.stream.Stream;
 
 import javax.annotation.*;
 
+import org.eu.zajc.akiwrapper.Akiwrapper.Answer;
+import org.eu.zajc.akiwrapper.core.entities.*;
+import org.eu.zajc.akiwrapper.core.entities.Server.*;
+import org.eu.zajc.akiwrapper.core.exceptions.*;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.*;
 import org.opentest4j.TestAbortedException;
 import org.slf4j.Logger;
 
-import com.github.markozajc.akiwrapper.Akiwrapper.Answer;
-import com.github.markozajc.akiwrapper.core.entities.*;
-import com.github.markozajc.akiwrapper.core.entities.Server.*;
-import com.github.markozajc.akiwrapper.core.exceptions.*;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 class IntegrationTest {
diff --git a/src/test/java/com/github/markozajc/akiwrapper/core/entities/IdentifiableTest.java b/src/test/java/org/eu/zajc/akiwrapper/core/entities/IdentifiableTest.java
index 986365e..5189ccd 100644
--- a/src/test/java/com/github/markozajc/akiwrapper/core/entities/IdentifiableTest.java
+++ b/src/test/java/org/eu/zajc/akiwrapper/core/entities/IdentifiableTest.java
@@ -3,20 +3,18 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities;
+package org.eu.zajc.akiwrapper.core.entities;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/github/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java b/src/test/java/org/eu/zajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java
index c2f06cb..bfb2ad6 100644
--- a/src/test/java/com/github/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java
+++ b/src/test/java/org/eu/zajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java
@@ -3,35 +3,32 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.entities.impl.immutable;
+package org.eu.zajc.akiwrapper.core.entities.impl.immutable;
 
-import static com.github.markozajc.akiwrapper.core.entities.Status.Reason.*;
+import static org.eu.zajc.akiwrapper.core.entities.Status.Reason.*;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE;
 
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 
+import org.eu.zajc.akiwrapper.core.entities.Status.Level;
+import org.eu.zajc.akiwrapper.core.entities.impl.StatusImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.*;
 
-import com.github.markozajc.akiwrapper.core.entities.Status.Level;
-import com.github.markozajc.akiwrapper.core.entities.impl.StatusImpl;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 class StatusImplTest {
diff --git a/src/test/java/com/github/markozajc/akiwrapper/core/utils/JSONUtilsTest.java b/src/test/java/org/eu/zajc/akiwrapper/core/utils/JSONUtilsTest.java
index 93e3388..f7e07f6 100644
--- a/src/test/java/com/github/markozajc/akiwrapper/core/utils/JSONUtilsTest.java
+++ b/src/test/java/org/eu/zajc/akiwrapper/core/utils/JSONUtilsTest.java
@@ -3,22 +3,20 @@
  * Akiwrapper, the Java API wrapper for Akinator
  * Copyright (C) 2017-2023 Marko Zajc
  *
- * This program is free software; you can redistribute it and/or modify it under the
+ * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301, USA.
+ * program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.github.markozajc.akiwrapper.core.utils;
+package org.eu.zajc.akiwrapper.core.utils;
 
-import static com.github.markozajc.akiwrapper.core.utils.JSONUtils.*;
+import static org.eu.zajc.akiwrapper.core.utils.JSONUtils.*;
 
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
diff --git a/versions-ruleset.xml b/versions-ruleset.xml
index 193c626..4d59c85 100644
--- a/versions-ruleset.xml
+++ b/versions-ruleset.xml
@@ -8,7 +8,7 @@
                         <ignoreVersions>
                                 <ignoreVersion type="regex">.*-alpha\d$</ignoreVersion>
                                 <ignoreVersion type="regex">.*-beta\d$</ignoreVersion>
-                                <ignoreVersion type="regex">.*-M\d$</ignoreVersion>
+                                <ignoreVersion type="regex">.*[-\.]M\d$</ignoreVersion>
                                 <ignoreVersion type="regex">.*-RC\d$</ignoreVersion>
                         </ignoreVersions>
                 </rule>