diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..85e4044 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Build with Maven + run: ./mvnw --batch-mode clean verify diff --git a/.gitignore b/.gitignore index 73b3466..00ad302 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ dist/ reports/ bin/ build/ -pom.xml perf/ +target/ +.idea/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/README.md b/README.md index ea2d605..e5cee5b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,25 @@ Informatics Department), of the Università degli Studi di Milano. Building -------- -You need [Ant](https://ant.apache.org/) and [Ivy](https://ant.apache.org/ivy/). -Then, run `ant ivy-setupjars jar`. +Uses [Apache Maven](https://maven.apache.org/) but you need Java 1.8+ only, project uses Maven Wrapper (no need to install anything). +Btw, my own preferred way to install Java and Maven as well is [SDKMAN](https://sdkman.io/). + +To build: +``` +./mvnw clean verify +``` + +To build with slow tests also: +``` +./mvnw clean verify -P slow +``` + +To "quick-build" (produce all artifacts but skip all test execution -- `-Dtest=void` matches no UT/IT to run): +``` +./mvnw clean verify -Dtest=void -P vigna-release +``` + +Available profiles: +* vigna-release -- used by release plugin (adds sources, javadoc, gpg, skip tests) +* slow -- runs "slow tests" as part of build as well -seba () diff --git a/bnd/biz.aQute.bnd-5.2.0.jar b/bnd/biz.aQute.bnd-5.2.0.jar deleted file mode 100644 index b1e2a04..0000000 Binary files a/bnd/biz.aQute.bnd-5.2.0.jar and /dev/null differ diff --git a/build.properties b/build.properties deleted file mode 100644 index 9228302..0000000 --- a/build.properties +++ /dev/null @@ -1,30 +0,0 @@ -version=2.7.3 - -build.sysclasspath=ignore - -jar.base=/usr/share/java -javadoc.base=/usr/share/javadoc - -dist=dist -src=src -test=test -slow=slow -reports=reports -coverage=coverage -checkstyle=checkstyle -docs=docs -build=build -instrumented=instr - -j2se.apiurl=https://docs.oracle.com/javase/8/docs/api/ -fastutil.apiurl=https://fastutil.di.unimi.it/docs/ -jsap.apiurl=http://www.martiansoftware.com/jsap/doc/javadoc/ -junit.apiurl=https://junit.org/junit4/javadoc/latest/ -log4j.apiurl=https://logging.apache.org/log4j/1.2/apidocs/ -slf4j.apiurl=https://www.slf4j.org/apidocs/ -commons-configuration2.apiurl=https://commons.apache.org/proper/commons-configuration/apidocs/ -commons-io.apiurl=https://commons.apache.org/proper/commons-io/javadocs/api-release/ -commons-lang3.apiurl=https://commons.apache.org/proper/commons-lang/javadocs/api-release/ -commons-collections4.apiurl=https://commons.apache.org/proper/commons-collections/javadocs/api-4.4/ -commons-math3.apiurl=https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/ -guava.apiurl=https://javadoc.io/doc/com.google.guava/guava/latest/index.html diff --git a/build.xml b/build.xml deleted file mode 100644 index 4519bbc..0000000 --- a/build.xml +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ivy.xml b/ivy.xml deleted file mode 100644 index 1b5939f..0000000 --- a/ivy.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/makefile b/makefile deleted file mode 100644 index 2ff85f5..0000000 --- a/makefile +++ /dev/null @@ -1,49 +0,0 @@ -include build.properties - -TAR=tar - -source: - rm -fr dsiutils-$(version) - ant clean - ln -s . dsiutils-$(version) - $(TAR) chvf dsiutils-$(version)-src.tar --owner=0 --group=0 \ - dsiutils-$(version)/README.md \ - dsiutils-$(version)/CHANGES \ - dsiutils-$(version)/COPYING.LESSER \ - dsiutils-$(version)/LICENSE-2.0.txt \ - dsiutils-$(version)/build.xml \ - dsiutils-$(version)/ivy.xml \ - dsiutils-$(version)/dsiutils.bnd \ - dsiutils-$(version)/pom-model.xml \ - dsiutils-$(version)/build.properties \ - $$(find dsiutils-$(version)/src/it/unimi/dsi -iname \*.java -or -iname \*.html -or -iname \*.in.16 -or -iname \*.out.12) \ - $$(find dsiutils-$(version)/test/it/unimi/dsi -iname \*.java -or -iname \*.html -or -iname \*.data) \ - $$(find dsiutils-$(version)/slow/it/unimi/dsi -iname \*.java -or -iname \*.html) \ - dsiutils-$(version)/src/overview.html - $(TAR) --delete --wildcards -v -f dsiutils-$(version)-src.tar \ - dsiutils-$(version)/src/it/unimi/dsi/test/*.java \ - dsiutils-$(version)/test/it/unimi/dsi/test/*.java \ - dsiutils-$(version)/src/it/unimi/dsi/util/IntParallel*.java \ - dsiutils-$(version)/src/it/unimi/dsi/util/XorGens*.java \ - dsiutils-$(version)/src/it/unimi/dsi/stat/Ziggurat.java - gzip -f dsiutils-$(version)-src.tar - rm dsiutils-$(version) - -binary: - rm -fr dsiutils-$(version) - $(TAR) zxvf dsiutils-$(version)-src.tar.gz - (cd dsiutils-$(version) && unset CLASSPATH && unset LOCAL_IVY_SETTINGS && ant ivy-clean ivy-setupjars && ant junit && ant clean && ant jar javadoc) - $(TAR) zcvf dsiutils-$(version)-bin.tar.gz --owner=0 --group=0 \ - dsiutils-$(version)/README.md \ - dsiutils-$(version)/CHANGES \ - dsiutils-$(version)/COPYING.LESSER \ - dsiutils-$(version)/LICENSE-2.0.txt \ - dsiutils-$(version)/dsiutils-$(version).jar \ - dsiutils-$(version)/docs - $(TAR) zcvf dsiutils-$(version)-deps.tar.gz --owner=0 --group=0 --transform='s|.*/||' $$(find dsiutils-$(version)/jars/runtime -iname \*.jar -exec readlink {} \;) - -stage: - rm -fr dsiutils-$(version) - $(TAR) zxvf dsiutils-$(version)-src.tar.gz - cp -fr bnd dsiutils-$(version) - (cd dsiutils-$(version) && unset CLASSPATH && unset LOCAL_IVY_SETTINGS && ant ivy-clean ivy-setupjars && ant stage) diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..b7f0646 --- /dev/null +++ b/mvnw @@ -0,0 +1,287 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.1.1 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + printf '%s' "$(cd "$basedir"; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname $0)") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $wrapperUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + elif command -v curl > /dev/null; then + QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=`cygpath --path --windows "$javaSource"` + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..474c9d6 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,187 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.1.1 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom-model.xml b/pom-model.xml deleted file mode 100644 index 1570349..0000000 --- a/pom-model.xml +++ /dev/null @@ -1,42 +0,0 @@ - - 4.0.0 - ${ivy.pom.groupId} - ${ivy.pom.artifactId} - jar - DSI Utilities - ${ivy.pom.version} - The DSI utilities are a mishmash of classes accumulated during the last twenty years in projects developed at the DSI (Dipartimento di Scienze dell'Informazione, i.e., Information Sciences Department), now DI (Dipartimento di Informatica, i.e., Informatics Department), of the Universita` degli Studi di Milano. - http://dsiutils.di.unimi.it/ - - - GNU Lesser General Public License Version 2.1+ - https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - repo - - - Apache License v2.0 - https://www.apache.org/licenses/LICENSE-2.0 - source - - - - scm:git://github.com/vigna/dsiutils.git - https://github.com/vigna/dsiutils - - - - boldi - Paolo Boldi - paolo.boldi@unimi.it - - - vigna - Sebastiano Vigna - sebastiano.vigna@unimi.it - - - - 1.8 - 1.8 - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..85f5a79 --- /dev/null +++ b/pom.xml @@ -0,0 +1,393 @@ + + + 4.0.0 + it.unimi.dsi + dsiutils + jar + DSI Utilities + 2.7.4-SNAPSHOT + The DSI utilities are a mishmash of classes accumulated during the last twenty years in projects developed at the DSI (Dipartimento di Scienze dell'Informazione, i.e., Information Sciences Department), now DI (Dipartimento di Informatica, i.e., Informatics Department), of the Universita` degli Studi di Milano. + http://dsiutils.di.unimi.it/ + + + GNU Lesser General Public License Version 2.1+ + https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + repo + + + Apache License v2.0 + https://www.apache.org/licenses/LICENSE-2.0 + source + + + + scm:git://github.com/vigna/dsiutils.git + scm:git://github.com/vigna/dsiutils.git + https://github.com/vigna/dsiutils + + + + sonatype.releases + Sonatype oss.sonatype.org Staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + sonatype.snapshots + Sonatype oss.sonatype.org Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + + + boldi + Paolo Boldi + paolo.boldi@unimi.it + + + vigna + Sebastiano Vigna + sebastiano.vigna@unimi.it + + + + + UTF-8 + + 1.8 + 1.8 + + 2023-03-08T12:00:00Z + + + + org.slf4j + slf4j-api + 2.0.3 + + + ch.qos.logback + logback-core + 1.3.4 + runtime + + + ch.qos.logback + logback-classic + 1.3.4 + runtime + + + it.unimi.dsi + fastutil + 8.5.11 + + + it.unimi.di + jsap + 20210129 + + + org.apache.commons + commons-configuration2 + 2.8.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + + com.google.guava + guava + 31.1-jre + + + + junit + junit + 4.13.2 + test + + + org.apache.commons + commons-collections4 + 4.4 + test + + + com.github.luben + zstd-jni + 1.5.4-2 + test + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.2.1 + + + org.codehaus.mojo + extra-enforcer-rules + 1.6.1 + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + org.apache.maven.plugins + maven-release-plugin + 3.0.0-M7 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M9 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M8 + + + + + biz.aQute.bnd + bnd-maven-plugin + 6.4.0 + + + + + + + + biz.aQute.bnd + bnd-maven-plugin + + + bnd-process + process-classes + + bnd-process + + + src/main/bnd/dsiutils.bnd + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + 1.8 + + + 3.8 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + default-test + test + + test + + + + **/*SlowTest.java + + + + + + + org.apache.maven.plugins + maven-release-plugin + + false + deploy + vigna-release + + + + + + + + + slow + + + + org.apache.maven.plugins + maven-surefire-plugin + + + slow-test + test + + test + + + + **/*SlowTest.java + + + + + + + + + + + + vigna-release + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + dsiutil ${project.version} + + stylesheet.css + + -breakiterator -tag "apiNote:a:API Notes:" -tag "implSpec:a:Implementation Specification:" -tag "implNote:a:Implementation Notes:" + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-release-artifacts + + sign + + + true + + --digest-algo=SHA512 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-failsafe-plugin + + true + + + + + + + diff --git a/dsiutils.bnd b/src/main/bnd/dsiutils.bnd similarity index 81% rename from dsiutils.bnd rename to src/main/bnd/dsiutils.bnd index 11d87f6..baf7fad 100644 --- a/dsiutils.bnd +++ b/src/main/bnd/dsiutils.bnd @@ -2,4 +2,4 @@ Automatic-Module-Name: it.unimi.dsi.dsiutils Bundle-Name: it.unimi.dsi.dsiutils Bundle-SymbolicName: it.unimi.dsi.dsiutils Export-Package: it.unimi.dsi.* -Bundle-Version: ${version} +Bundle-Version: ${project.version} diff --git a/src/it/unimi/dsi/Util.java b/src/main/java/it/unimi/dsi/Util.java similarity index 99% rename from src/it/unimi/dsi/Util.java rename to src/main/java/it/unimi/dsi/Util.java index fe2a1e8..37048bc 100644 --- a/src/it/unimi/dsi/Util.java +++ b/src/main/java/it/unimi/dsi/Util.java @@ -52,7 +52,7 @@ private Util() {} if (FORMAT_DOUBLE instanceof DecimalFormat) ((DecimalFormat)FORMAT_LONG).applyPattern("#,###"); } - private static final FieldPosition UNUSED_FIELD_POSITION = new java.text.FieldPosition(0); + private static final FieldPosition UNUSED_FIELD_POSITION = new FieldPosition(0); /** Formats a number. * diff --git a/src/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java b/src/main/java/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java similarity index 98% rename from src/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java rename to src/main/java/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java index f761512..fde90f6 100644 --- a/src/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java +++ b/src/main/java/it/unimi/dsi/big/io/FileLinesByteArrayCollection.java @@ -48,11 +48,11 @@ * No decoding is performed. * *

- * Using {@linkplain java.util.Collection#contains(java.lang.Object) direct access} is strongly + * Using {@linkplain java.util.Collection#contains(Object) direct access} is strongly * discouraged (it will require a full scan of the file), but the {@link #iterator()} can be * fruitfully used to scan the file, and can be called any number of times, as it opens an * independent input stream at each call. For the same reason, the returned iterator type - * ({@link it.unimi.dsi.io.FileLinesCollection.FileLinesIterator}) is {@link java.io.Closeable}, and + * ({@link it.unimi.dsi.io.FileLinesCollection.FileLinesIterator}) is {@link Closeable}, and * should be closed after usage. * *

diff --git a/src/it/unimi/dsi/big/io/FileLinesCollection.java b/src/main/java/it/unimi/dsi/big/io/FileLinesCollection.java similarity index 95% rename from src/it/unimi/dsi/big/io/FileLinesCollection.java rename to src/main/java/it/unimi/dsi/big/io/FileLinesCollection.java index fabb0e9..44e1797 100644 --- a/src/it/unimi/dsi/big/io/FileLinesCollection.java +++ b/src/main/java/it/unimi/dsi/big/io/FileLinesCollection.java @@ -42,9 +42,9 @@ * *

* Warning: the lines returned by iterators generated by instances of this class - * are not cacheable. The returned value is a {@link it.unimi.dsi.lang.MutableString} + * are not cacheable. The returned value is a {@link MutableString} * instance that is reused at each call, and that is modified by a call to - * {@link java.util.Iterator#hasNext() hasNext()}. Thus, for instance, + * {@link Iterator#hasNext() hasNext()}. Thus, for instance, * * 

  * ObjectIterators.unwrap(fileLinesColletion.iterator());
@@ -52,17 +52,17 @@
  *
  * will not give the expected results. Use {@link #allLines()} to get the {@linkplain ObjectBigList
  * big list} of all lines (again, under the form of compact
- * {@link it.unimi.dsi.lang.MutableString}s). Note also that {@link #toString()} will return a
+ * {@link MutableString}s). Note also that {@link #toString()} will return a
  * single string containing all file lines separated by the string associated with the system
  * property line.separator.
  *
  * 

  * An instance of this class allows to access the lines of a file as a {@link java.util.Collection}.
- * Using {@linkplain java.util.Collection#contains(java.lang.Object) direct access} is strongly
+ * Using {@linkplain java.util.Collection#contains(Object) direct access} is strongly
  * discouraged (it will require a full scan of the file), but the {@link #iterator()} can be
  * fruitfully used to scan the file, and can be called any number of times, as it opens an
  * independent input stream at each call. For the same reason, the returned iterator type
- * ({@link it.unimi.dsi.io.FileLinesCollection.FileLinesIterator}) is {@link java.io.Closeable}, and
+ * ({@link it.unimi.dsi.io.FileLinesCollection.FileLinesIterator}) is {@link Closeable}, and
  * should be closed after usage.
  *
  * 

diff --git a/src/it/unimi/dsi/big/io/package-info.java b/src/main/java/it/unimi/dsi/big/io/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/big/io/package-info.java
rename to src/main/java/it/unimi/dsi/big/io/package-info.java
diff --git a/src/it/unimi/dsi/big/util/AbstractPrefixMap.java b/src/main/java/it/unimi/dsi/big/util/AbstractPrefixMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/AbstractPrefixMap.java
rename to src/main/java/it/unimi/dsi/big/util/AbstractPrefixMap.java
diff --git a/src/it/unimi/dsi/big/util/FrontCodedStringBigList.java b/src/main/java/it/unimi/dsi/big/util/FrontCodedStringBigList.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/FrontCodedStringBigList.java
rename to src/main/java/it/unimi/dsi/big/util/FrontCodedStringBigList.java
diff --git a/src/it/unimi/dsi/big/util/ImmutableBinaryTrie.java b/src/main/java/it/unimi/dsi/big/util/ImmutableBinaryTrie.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/ImmutableBinaryTrie.java
rename to src/main/java/it/unimi/dsi/big/util/ImmutableBinaryTrie.java
diff --git a/src/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java b/src/main/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java
rename to src/main/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java
diff --git a/src/it/unimi/dsi/big/util/LiterallySignedStringMap.java b/src/main/java/it/unimi/dsi/big/util/LiterallySignedStringMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/LiterallySignedStringMap.java
rename to src/main/java/it/unimi/dsi/big/util/LiterallySignedStringMap.java
diff --git a/src/it/unimi/dsi/big/util/LongBigListSignedStringMap.java b/src/main/java/it/unimi/dsi/big/util/LongBigListSignedStringMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/LongBigListSignedStringMap.java
rename to src/main/java/it/unimi/dsi/big/util/LongBigListSignedStringMap.java
diff --git a/src/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java b/src/main/java/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java
similarity index 99%
rename from src/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java
rename to src/main/java/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java
index 7b0959d..56d9e72 100644
--- a/src/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java
+++ b/src/main/java/it/unimi/dsi/big/util/MappedFrontCodedStringBigList.java
@@ -200,8 +200,8 @@ public static void build(final String basename, final int ratio, final Iterator<
 		bytes.close();
 		pointers.close();
 		final Properties properties = new Properties();
-		properties.setProperty(MappedFrontCodedStringBigList.PropertyKeys.N, n);
-		properties.setProperty(MappedFrontCodedStringBigList.PropertyKeys.RATIO, ratio);
+		properties.setProperty( PropertyKeys.N, n);
+		properties.setProperty( PropertyKeys.RATIO, ratio);
 		properties.save(basename + MappedFrontCodedStringBigList.PROPERTIES_EXTENSION);
 	}
 
diff --git a/src/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java b/src/main/java/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java
similarity index 98%
rename from src/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java
rename to src/main/java/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java
index 3a99aec..9bba0ad 100644
--- a/src/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java
+++ b/src/main/java/it/unimi/dsi/big/util/PermutedFrontCodedStringBigList.java
@@ -43,7 +43,7 @@
 import it.unimi.dsi.util.PermutedFrontCodedStringList;
 
 /**
- * A {@link it.unimi.dsi.big.util.FrontCodedStringBigList} whose indices are permuted.
+ * A {@link FrontCodedStringBigList} whose indices are permuted.
  *
  * 

  * This class is functionally identical to {@link PermutedFrontCodedStringList}, except for the
diff --git a/src/it/unimi/dsi/big/util/PrefixMap.java b/src/main/java/it/unimi/dsi/big/util/PrefixMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/PrefixMap.java
rename to src/main/java/it/unimi/dsi/big/util/PrefixMap.java
diff --git a/src/it/unimi/dsi/big/util/SemiExternalGammaBigList.java b/src/main/java/it/unimi/dsi/big/util/SemiExternalGammaBigList.java
similarity index 98%
rename from src/it/unimi/dsi/big/util/SemiExternalGammaBigList.java
rename to src/main/java/it/unimi/dsi/big/util/SemiExternalGammaBigList.java
index 495cf27..a5bab07 100644
--- a/src/it/unimi/dsi/big/util/SemiExternalGammaBigList.java
+++ b/src/main/java/it/unimi/dsi/big/util/SemiExternalGammaBigList.java
@@ -31,7 +31,7 @@
 /** Provides semi-external random access to a {@linkplain LongBigList big list}
  * of {@linkplain OutputBitStream#writeGamma(int) γ-encoded} integers.
  *
- * 
This class is a semi-external {@link it.unimi.dsi.fastutil.longs.LongBigList} that
+ * 
This class is a semi-external {@link LongBigList} that
  * MG4J uses to access files containing frequencies.
  *
  * 
Instead, this class accesses frequencies in their
diff --git a/src/it/unimi/dsi/big/util/ShiftAddXorSignedStringMap.java b/src/main/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/ShiftAddXorSignedStringMap.java
rename to src/main/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMap.java
diff --git a/src/it/unimi/dsi/big/util/StringMap.java b/src/main/java/it/unimi/dsi/big/util/StringMap.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/StringMap.java
rename to src/main/java/it/unimi/dsi/big/util/StringMap.java
diff --git a/src/it/unimi/dsi/big/util/StringMaps.java b/src/main/java/it/unimi/dsi/big/util/StringMaps.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/StringMaps.java
rename to src/main/java/it/unimi/dsi/big/util/StringMaps.java
diff --git a/src/it/unimi/dsi/big/util/TernaryIntervalSearchTree.java b/src/main/java/it/unimi/dsi/big/util/TernaryIntervalSearchTree.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/TernaryIntervalSearchTree.java
rename to src/main/java/it/unimi/dsi/big/util/TernaryIntervalSearchTree.java
diff --git a/src/it/unimi/dsi/big/util/package-info.java b/src/main/java/it/unimi/dsi/big/util/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/big/util/package-info.java
rename to src/main/java/it/unimi/dsi/big/util/package-info.java
diff --git a/src/it/unimi/dsi/bits/AbstractBitVector.java b/src/main/java/it/unimi/dsi/bits/AbstractBitVector.java
similarity index 99%
rename from src/it/unimi/dsi/bits/AbstractBitVector.java
rename to src/main/java/it/unimi/dsi/bits/AbstractBitVector.java
index f023c08..360a085 100644
--- a/src/it/unimi/dsi/bits/AbstractBitVector.java
+++ b/src/main/java/it/unimi/dsi/bits/AbstractBitVector.java
@@ -646,7 +646,7 @@ public long previousIndex() {
 		}
 
 		@Override
-		public it.unimi.dsi.fastutil.longs.LongBigListIterator listIterator() {
+		public LongBigListIterator listIterator() {
 			return new LongBigListIteratorView();
 		}
 
diff --git a/src/it/unimi/dsi/bits/BitVector.java b/src/main/java/it/unimi/dsi/bits/BitVector.java
similarity index 98%
rename from src/it/unimi/dsi/bits/BitVector.java
rename to src/main/java/it/unimi/dsi/bits/BitVector.java
index b148f7a..a83c3b6 100644
--- a/src/it/unimi/dsi/bits/BitVector.java
+++ b/src/main/java/it/unimi/dsi/bits/BitVector.java
@@ -39,7 +39,7 @@
  * Operation of a bit vector are partially of boolean nature (e.g., logical operations between
  * vectors), partially of language-theoretical nature (e.g., concatenation), and partially of
  * set-theoretical nature (e.g., asking which bits are set to one). To accomodate all these points
- * of view, this interface extends {@link it.unimi.dsi.fastutil.booleans.BooleanBigList}, but also
+ * of view, this interface extends {@link BooleanBigList}, but also
  * provides an {@link #asLongSet()} method that exposes a {@link java.util.BitSet}-like view and a
  * {@link #asLongBigList(int)} method that provides integer-like access to blocks of bits of given
  * width.
@@ -50,7 +50,7 @@
  * returned by {@link #asLongSet()} (albeit a direct {@link #count()} method is provided, too). The
  * standard {@link java.util.Collection#addAll(java.util.Collection)} method can be used to
  * concatenate bit vectors, and
- * {@linkplain it.unimi.dsi.fastutil.booleans.BooleanBigList#subList(long, long) sublist views} make
+ * {@linkplain BooleanBigList#subList(long, long) sublist views} make
  * it easy performing any kind of logical operation on subvectors.
  *
  * 

diff --git a/src/it/unimi/dsi/bits/BitVectors.java b/src/main/java/it/unimi/dsi/bits/BitVectors.java
similarity index 98%
rename from src/it/unimi/dsi/bits/BitVectors.java
rename to src/main/java/it/unimi/dsi/bits/BitVectors.java
index 905b1da..abdf9bd 100644
--- a/src/it/unimi/dsi/bits/BitVectors.java
+++ b/src/main/java/it/unimi/dsi/bits/BitVectors.java
@@ -179,7 +179,7 @@ public void read(final DataInput dis, final LongArrayBitVector bv) throws IOExce
 		}
 	}
 
-	/** A serializer for {@link LongArrayBitVector} instances that can be used with {@link it.unimi.dsi.io.OfflineIterable}. It can serialize
+	/** A serializer for {@link LongArrayBitVector} instances that can be used with {@link OfflineIterable}. It can serialize
 	 * any implementation of {@link BitVector}, and requires at construction time an instance of {@link LongArrayBitVector} that
 	 * will be used to return deserialized elements. */
 	public static BitVectorOfflineSerializer OFFLINE_SERIALIZER = new BitVectorOfflineSerializer();
diff --git a/src/it/unimi/dsi/bits/BooleanListBitVector.java b/src/main/java/it/unimi/dsi/bits/BooleanListBitVector.java
similarity index 100%
rename from src/it/unimi/dsi/bits/BooleanListBitVector.java
rename to src/main/java/it/unimi/dsi/bits/BooleanListBitVector.java
diff --git a/src/it/unimi/dsi/bits/Fast.java b/src/main/java/it/unimi/dsi/bits/Fast.java
similarity index 100%
rename from src/it/unimi/dsi/bits/Fast.java
rename to src/main/java/it/unimi/dsi/bits/Fast.java
diff --git a/src/it/unimi/dsi/bits/HuTuckerTransformationStrategy.java b/src/main/java/it/unimi/dsi/bits/HuTuckerTransformationStrategy.java
similarity index 100%
rename from src/it/unimi/dsi/bits/HuTuckerTransformationStrategy.java
rename to src/main/java/it/unimi/dsi/bits/HuTuckerTransformationStrategy.java
diff --git a/src/it/unimi/dsi/bits/LongArrayBitVector.java b/src/main/java/it/unimi/dsi/bits/LongArrayBitVector.java
similarity index 99%
rename from src/it/unimi/dsi/bits/LongArrayBitVector.java
rename to src/main/java/it/unimi/dsi/bits/LongArrayBitVector.java
index ed36816..12c590c 100644
--- a/src/it/unimi/dsi/bits/LongArrayBitVector.java
+++ b/src/main/java/it/unimi/dsi/bits/LongArrayBitVector.java
@@ -37,7 +37,7 @@
  * The main goal of this class is to be fast and flexible. It implements a lightweight, fast, open,
  * optimized, reuse-oriented version of bit vectors. Instances of this class represent a bit vector
  * using an array of longs that is enlarged as needed when new entries are created (using
- * {@link it.unimi.dsi.fastutil.longs.LongArrays#grow(long[], int, int)}), but is never
+ * {@link LongArrays#grow(long[], int, int)}), but is never
  * made smaller (even on a {@link #clear()}). Use {@link #trim()} for that purpose.
  *
  * 

diff --git a/src/it/unimi/dsi/bits/LongBigArrayBitVector.java b/src/main/java/it/unimi/dsi/bits/LongBigArrayBitVector.java
similarity index 100%
rename from src/it/unimi/dsi/bits/LongBigArrayBitVector.java
rename to src/main/java/it/unimi/dsi/bits/LongBigArrayBitVector.java
diff --git a/src/it/unimi/dsi/bits/PrefixCoderTransformationStrategy.java b/src/main/java/it/unimi/dsi/bits/PrefixCoderTransformationStrategy.java
similarity index 100%
rename from src/it/unimi/dsi/bits/PrefixCoderTransformationStrategy.java
rename to src/main/java/it/unimi/dsi/bits/PrefixCoderTransformationStrategy.java
diff --git a/src/it/unimi/dsi/bits/TransformationStrategies.java b/src/main/java/it/unimi/dsi/bits/TransformationStrategies.java
similarity index 100%
rename from src/it/unimi/dsi/bits/TransformationStrategies.java
rename to src/main/java/it/unimi/dsi/bits/TransformationStrategies.java
diff --git a/src/it/unimi/dsi/bits/TransformationStrategy.java b/src/main/java/it/unimi/dsi/bits/TransformationStrategy.java
similarity index 100%
rename from src/it/unimi/dsi/bits/TransformationStrategy.java
rename to src/main/java/it/unimi/dsi/bits/TransformationStrategy.java
diff --git a/src/it/unimi/dsi/bits/package-info.java b/src/main/java/it/unimi/dsi/bits/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/bits/package-info.java
rename to src/main/java/it/unimi/dsi/bits/package-info.java
diff --git a/src/it/unimi/dsi/compression/CanonicalFast64CodeWordDecoder.java b/src/main/java/it/unimi/dsi/compression/CanonicalFast64CodeWordDecoder.java
similarity index 100%
rename from src/it/unimi/dsi/compression/CanonicalFast64CodeWordDecoder.java
rename to src/main/java/it/unimi/dsi/compression/CanonicalFast64CodeWordDecoder.java
diff --git a/src/it/unimi/dsi/compression/CodeWordCoder.java b/src/main/java/it/unimi/dsi/compression/CodeWordCoder.java
similarity index 100%
rename from src/it/unimi/dsi/compression/CodeWordCoder.java
rename to src/main/java/it/unimi/dsi/compression/CodeWordCoder.java
diff --git a/src/it/unimi/dsi/compression/Codec.java b/src/main/java/it/unimi/dsi/compression/Codec.java
similarity index 100%
rename from src/it/unimi/dsi/compression/Codec.java
rename to src/main/java/it/unimi/dsi/compression/Codec.java
diff --git a/src/it/unimi/dsi/compression/Coder.java b/src/main/java/it/unimi/dsi/compression/Coder.java
similarity index 100%
rename from src/it/unimi/dsi/compression/Coder.java
rename to src/main/java/it/unimi/dsi/compression/Coder.java
diff --git a/src/it/unimi/dsi/compression/Decoder.java b/src/main/java/it/unimi/dsi/compression/Decoder.java
similarity index 100%
rename from src/it/unimi/dsi/compression/Decoder.java
rename to src/main/java/it/unimi/dsi/compression/Decoder.java
diff --git a/src/it/unimi/dsi/compression/Fast64CodeWordCoder.java b/src/main/java/it/unimi/dsi/compression/Fast64CodeWordCoder.java
similarity index 100%
rename from src/it/unimi/dsi/compression/Fast64CodeWordCoder.java
rename to src/main/java/it/unimi/dsi/compression/Fast64CodeWordCoder.java
diff --git a/src/it/unimi/dsi/compression/HuTuckerCodec.java b/src/main/java/it/unimi/dsi/compression/HuTuckerCodec.java
similarity index 100%
rename from src/it/unimi/dsi/compression/HuTuckerCodec.java
rename to src/main/java/it/unimi/dsi/compression/HuTuckerCodec.java
diff --git a/src/it/unimi/dsi/compression/HuffmanCodec.java b/src/main/java/it/unimi/dsi/compression/HuffmanCodec.java
similarity index 100%
rename from src/it/unimi/dsi/compression/HuffmanCodec.java
rename to src/main/java/it/unimi/dsi/compression/HuffmanCodec.java
diff --git a/src/it/unimi/dsi/compression/PrefixCodec.java b/src/main/java/it/unimi/dsi/compression/PrefixCodec.java
similarity index 100%
rename from src/it/unimi/dsi/compression/PrefixCodec.java
rename to src/main/java/it/unimi/dsi/compression/PrefixCodec.java
diff --git a/src/it/unimi/dsi/compression/PrefixCoder.java b/src/main/java/it/unimi/dsi/compression/PrefixCoder.java
similarity index 95%
rename from src/it/unimi/dsi/compression/PrefixCoder.java
rename to src/main/java/it/unimi/dsi/compression/PrefixCoder.java
index 54c67ef..9841b08 100644
--- a/src/it/unimi/dsi/compression/PrefixCoder.java
+++ b/src/main/java/it/unimi/dsi/compression/PrefixCoder.java
@@ -25,7 +25,7 @@
  *
  * 
Not all coders are codeword-based (for instance, arithmetic coding
  * is not codeword-based). However, coders that are based on prefix-free codewords are invited
- * to return by means of {@link it.unimi.dsi.compression.Codec#coder()} an
+ * to return by means of {@link Codec#coder()} an
  * implementation of this interface.
  *
  * 
Note that the {@linkplain PrefixCodec#coder() coder} returned by a {@link PrefixCodec} is
diff --git a/src/it/unimi/dsi/compression/TreeDecoder.java b/src/main/java/it/unimi/dsi/compression/TreeDecoder.java
similarity index 94%
rename from src/it/unimi/dsi/compression/TreeDecoder.java
rename to src/main/java/it/unimi/dsi/compression/TreeDecoder.java
index b90f38a..d4ee36e 100644
--- a/src/it/unimi/dsi/compression/TreeDecoder.java
+++ b/src/main/java/it/unimi/dsi/compression/TreeDecoder.java
@@ -66,8 +66,8 @@ public LeafNode(final int symbol) {
 
 	/** Creates a new codeword-based decoder using the given tree. It
 	 * is responsibility of the caller that the tree is well-formed,
-	 * that is, that all internal nodes are instances of {@link TreeDecoder.Node}
-	 * and all leaf nodes are instances of  {@link TreeDecoder.LeafNode}.
+	 * that is, that all internal nodes are instances of {@link Node}
+	 * and all leaf nodes are instances of  {@link LeafNode}.
 	 *
 	 * @param root the root of a decoding tree.
 	 * @param n the number of leaves (symbols).
@@ -137,10 +137,10 @@ public int decode(final InputBitStream ibs) throws IOException {
 	 * @param node a subtree of the decoding tree.
 	 * @param prefix the path leading to n.
 	 */
-	private void buildCodes(final BitVector[] codeWord, final TreeDecoder.Node node, final BitVector prefix) {
+	private void buildCodes(final BitVector[] codeWord, final Node node, final BitVector prefix) {
 
-		if (node instanceof TreeDecoder.LeafNode) {
-			codeWord[((TreeDecoder.LeafNode)node).symbol] = prefix;
+		if (node instanceof LeafNode) {
+			codeWord[((LeafNode)node).symbol] = prefix;
 			return;
 		}
 
diff --git a/src/it/unimi/dsi/compression/package-info.java b/src/main/java/it/unimi/dsi/compression/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/compression/package-info.java
rename to src/main/java/it/unimi/dsi/compression/package-info.java
diff --git a/src/it/unimi/dsi/io/ByteBufferInputStream.java b/src/main/java/it/unimi/dsi/io/ByteBufferInputStream.java
similarity index 97%
rename from src/it/unimi/dsi/io/ByteBufferInputStream.java
rename to src/main/java/it/unimi/dsi/io/ByteBufferInputStream.java
index 19829dc..a9de443 100644
--- a/src/it/unimi/dsi/io/ByteBufferInputStream.java
+++ b/src/main/java/it/unimi/dsi/io/ByteBufferInputStream.java
@@ -35,7 +35,7 @@
  *
  * 
Java's {@linkplain FileChannel#map(MapMode, long, long) memory-mapping facilities} have
  * the severe limitation of mapping at most {@link Integer#MAX_VALUE} bytes, as they
- * expose the content of a file using a {@link MappedByteBuffer}. This class can {@linkplain  #map(FileChannel, FileChannel.MapMode) expose
+ * expose the content of a file using a {@link MappedByteBuffer}. This class can {@linkplain  #map(FileChannel, MapMode) expose
  * a file of arbitrary length} as a {@linkplain RepositionableStream repositionable} {@link MeasurableInputStream}
  * that is actually based on an array of {@link MappedByteBuffer}s, each mapping
  * a chunk of {@link #CHUNK_SIZE} bytes.
@@ -47,7 +47,7 @@
 public class ByteBufferInputStream extends MeasurableInputStream implements RepositionableStream {
 	private static int CHUNK_SHIFT = 30;
 
-	/** The size of a chunk created by {@link #map(FileChannel, FileChannel.MapMode)}. */
+	/** The size of a chunk created by {@link #map(FileChannel, MapMode)}. */
 	public static final long CHUNK_SIZE = 1L << CHUNK_SHIFT;
 
 	/** The underlying byte buffers. */
diff --git a/src/it/unimi/dsi/io/ByteDiskQueue.java b/src/main/java/it/unimi/dsi/io/ByteDiskQueue.java
similarity index 100%
rename from src/it/unimi/dsi/io/ByteDiskQueue.java
rename to src/main/java/it/unimi/dsi/io/ByteDiskQueue.java
diff --git a/src/it/unimi/dsi/io/DebugInputBitStream.java b/src/main/java/it/unimi/dsi/io/DebugInputBitStream.java
similarity index 98%
rename from src/it/unimi/dsi/io/DebugInputBitStream.java
rename to src/main/java/it/unimi/dsi/io/DebugInputBitStream.java
index 5a99bdc..3bf9d9d 100644
--- a/src/it/unimi/dsi/io/DebugInputBitStream.java
+++ b/src/main/java/it/unimi/dsi/io/DebugInputBitStream.java
@@ -29,7 +29,7 @@
  *
  * 
This class can be used to wrap an input bit stream. The semantics of the
  * resulting read operations is unchanged, but each operation will be logged. The
- * conventions are the same as those of {@link it.unimi.dsi.io.DebugOutputBitStream},
+ * conventions are the same as those of {@link DebugOutputBitStream},
  * with the following additions:
  *
  * 

diff --git a/src/it/unimi/dsi/io/DebugOutputBitStream.java b/src/main/java/it/unimi/dsi/io/DebugOutputBitStream.java
similarity index 100%
rename from src/it/unimi/dsi/io/DebugOutputBitStream.java
rename to src/main/java/it/unimi/dsi/io/DebugOutputBitStream.java
diff --git a/src/it/unimi/dsi/io/DelimitedWordReader.java b/src/main/java/it/unimi/dsi/io/DelimitedWordReader.java
similarity index 100%
rename from src/it/unimi/dsi/io/DelimitedWordReader.java
rename to src/main/java/it/unimi/dsi/io/DelimitedWordReader.java
diff --git a/src/it/unimi/dsi/io/FastBufferedReader.java b/src/main/java/it/unimi/dsi/io/FastBufferedReader.java
similarity index 98%
rename from src/it/unimi/dsi/io/FastBufferedReader.java
rename to src/main/java/it/unimi/dsi/io/FastBufferedReader.java
index 5515aa3..d8d445a 100644
--- a/src/it/unimi/dsi/io/FastBufferedReader.java
+++ b/src/main/java/it/unimi/dsi/io/FastBufferedReader.java
@@ -31,14 +31,14 @@
 import it.unimi.dsi.lang.MutableString;
 
 /** A lightweight, unsynchronised buffered reader based on
- * {@linkplain it.unimi.dsi.lang.MutableString mutable strings}.
+ * {@linkplain MutableString mutable strings}.
  *
  * 
This class provides buffering for readers, but it does so with
  * purposes and an internal logic that are radically different from the ones
  * adopted in {@link java.io.BufferedReader}.
  *
  * 
There is no support for marking. All methods are unsychronised. All
- * methods returning strings do so by writing in a given {@link it.unimi.dsi.lang.MutableString}.
+ * methods returning strings do so by writing in a given {@link MutableString}.
  *
  * 
Note that instances of this class can wrap {@linkplain #FastBufferedReader(char[]) an array}
  * or a {@linkplain #FastBufferedReader(MutableString) mutable string}. In this case,
@@ -46,7 +46,7 @@
  * alternative to {@link java.io.CharArrayReader}
  * providing additional services such as word and line breaking.
  *
- * 
As any {@link it.unimi.dsi.io.WordReader}, this class is serialisable.
+ * 
As any {@link WordReader}, this class is serialisable.
  * The only field kept is the current buffer size, which will be used to rebuild
  * a fast buffered reader with the same buffer size. All other fields will be reset.
  *
@@ -328,7 +328,7 @@ public int read(final char[] b, int offset, int length) throws IOException {
 	 *
 	 * 
The next line of input (defined as in {@link java.io.BufferedReader#readLine()})
 	 * will be stored into s. Note that if s is
-	 * not {@linkplain it.unimi.dsi.lang.MutableString loose}
+	 * not {@linkplain MutableString loose}
 	 * this method will be quite inefficient.
 	 *
 	 * @param s a mutable string that will be used to store the next line (which could be empty).
diff --git a/src/it/unimi/dsi/io/FileLinesByteArrayIterable.java b/src/main/java/it/unimi/dsi/io/FileLinesByteArrayIterable.java
similarity index 97%
rename from src/it/unimi/dsi/io/FileLinesByteArrayIterable.java
rename to src/main/java/it/unimi/dsi/io/FileLinesByteArrayIterable.java
index 0159881..7a68984 100644
--- a/src/it/unimi/dsi/io/FileLinesByteArrayIterable.java
+++ b/src/main/java/it/unimi/dsi/io/FileLinesByteArrayIterable.java
@@ -52,8 +52,8 @@
  * 

  * The result of a call to {@link #iterator()} can be used to scan the file; each call will open an
  * independent input stream. The returned iterator type
- * ({@link it.unimi.dsi.io.FileLinesByteArrayIterable.FileLinesIterator FileLinesIterator}) is
- * {@link java.io.Closeable}, and should be closed after usage. Exhausted iterators, however, will
+ * ({@link FileLinesIterator FileLinesIterator}) is
+ * {@link Closeable}, and should be closed after usage. Exhausted iterators, however, will
  * be closed automagically.
  *
  * 

@@ -168,7 +168,7 @@ public FileLinesByteArrayIterable(final String filename, final long size, final
 	 * An iterator over the lines of a {@link FileLinesByteArrayIterable}.
 	 *
 	 * 

-	 * Instances of this class open an {@link java.io.InputStream}, and thus should be
+	 * Instances of this class open an {@link InputStream}, and thus should be
 	 * {@linkplain Closeable#close() closed} after usage. A “safety-net” finaliser tries to
 	 * take care of the cases in which closing an instance is impossible. An exhausted iterator,
 	 * however, will be closed automagically.
diff --git a/src/it/unimi/dsi/io/FileLinesCollection.java b/src/main/java/it/unimi/dsi/io/FileLinesCollection.java
similarity index 94%
rename from src/it/unimi/dsi/io/FileLinesCollection.java
rename to src/main/java/it/unimi/dsi/io/FileLinesCollection.java
index 907cd9f..345c8dc 100644
--- a/src/it/unimi/dsi/io/FileLinesCollection.java
+++ b/src/main/java/it/unimi/dsi/io/FileLinesCollection.java
@@ -38,26 +38,26 @@
  *
  * 

  * Warning: the lines returned by iterators generated by instances of this class
- * are not cacheable. The returned value is a {@link it.unimi.dsi.lang.MutableString}
+ * are not cacheable. The returned value is a {@link MutableString}
  * instance that is reused at each call, and that is modified by a call to
- * {@link java.util.Iterator#hasNext() hasNext()}. Thus, for instance,
+ * {@link Iterator#hasNext() hasNext()}. Thus, for instance,
  *
  * 
  * ObjectIterators.unwrap(fileLinesColletion.iterator());
  * 

  *
  * will not give the expected results. Use {@link #allLines()} to get the list of all lines (again,
- * under the form of compact {@link it.unimi.dsi.lang.MutableString}s). Note also that
+ * under the form of compact {@link MutableString}s). Note also that
  * {@link #toString()} will return a single string containing all file lines separated by the string
  * associated with the system property line.separator.
  *
  * 

  * An instance of this class allows to access the lines of a file as a {@link java.util.Collection}.
- * Using {@linkplain java.util.Collection#contains(java.lang.Object) direct access} is strongly
+ * Using {@linkplain java.util.Collection#contains(Object) direct access} is strongly
  * discouraged (it will require a full scan of the file), but the {@link #iterator()} can be
  * fruitfully used to scan the file, and can be called any number of times, as it opens an
  * independent input stream at each call. For the same reason, the returned iterator type
- * ({@link it.unimi.dsi.io.FileLinesCollection.FileLinesIterator}) is {@link java.io.Closeable}, and
+ * ({@link FileLinesIterator}) is {@link Closeable}, and
  * should be closed after usage.
  *
  * 

diff --git a/src/it/unimi/dsi/io/FileLinesMutableStringIterable.java b/src/main/java/it/unimi/dsi/io/FileLinesMutableStringIterable.java
similarity index 96%
rename from src/it/unimi/dsi/io/FileLinesMutableStringIterable.java
rename to src/main/java/it/unimi/dsi/io/FileLinesMutableStringIterable.java
index 0254898..e027bcd 100644
--- a/src/it/unimi/dsi/io/FileLinesMutableStringIterable.java
+++ b/src/main/java/it/unimi/dsi/io/FileLinesMutableStringIterable.java
@@ -45,9 +45,9 @@
  *
  * 

  * Warning: the lines returned by iterators generated by instances of this class
- * are not cacheable. The returned value is a {@link it.unimi.dsi.lang.MutableString
+ * are not cacheable. The returned value is a {@link MutableString
  * MutableString} instance that is reused at each call, and that is modified by a call to
- * {@link java.util.Iterator#hasNext() hasNext()}. Thus, for instance,
+ * {@link Iterator#hasNext() hasNext()}. Thus, for instance,
  *
  * 
  * ObjectIterators.unwrap(fileLinesMutableStringIterable.iterator());
@@ -59,8 +59,8 @@
  * 

  * The result of a call to {@link #iterator()} can be used to scan the file; each call will open an
  * independent input stream. The returned iterator type
- * ({@link it.unimi.dsi.io.FileLinesMutableStringIterable.FileLinesIterator FileLinesIterator}) is
- * {@link java.io.Closeable}, and should be closed after usage. Exhausted iterators, however, will
+ * ({@link FileLinesIterator FileLinesIterator}) is
+ * {@link Closeable}, and should be closed after usage. Exhausted iterators, however, will
  * be closed automagically.
  *
  * 

@@ -233,7 +233,7 @@ public FileLinesMutableStringIterable(final String filename, final long size, fi
 	 * An iterator over the lines of a {@link FileLinesMutableStringIterable}.
 	 *
 	 * 

-	 * Instances of this class open an {@linkplain java.io.InputStream input stream}, and thus should be
+	 * Instances of this class open an {@linkplain InputStream input stream}, and thus should be
 	 * {@linkplain Closeable#close() closed} after usage. A “safety-net” finaliser tries to
 	 * take care of the cases in which closing an instance is impossible. An exhausted iterator,
 	 * however, will be closed automagically.
diff --git a/src/it/unimi/dsi/io/InputBitStream.java b/src/main/java/it/unimi/dsi/io/InputBitStream.java
similarity index 98%
rename from src/it/unimi/dsi/io/InputBitStream.java
rename to src/main/java/it/unimi/dsi/io/InputBitStream.java
index 67ff528..773567b 100644
--- a/src/it/unimi/dsi/io/InputBitStream.java
+++ b/src/main/java/it/unimi/dsi/io/InputBitStream.java
@@ -52,7 +52,7 @@
  * 
This class can also {@linkplain #InputBitStream(byte[]) wrap a byte
  * array}; this is much more lightweight than wrapping a {@link
  * it.unimi.dsi.fastutil.io.FastByteArrayInputStream} wrapping the array. Overflowing the array
- * will cause an {@link java.io.EOFException}.
+ * will cause an {@link EOFException}.
  *
  * 
Note that when reading using a vector of bytes bits are read in the
  * stream format (see {@link OutputBitStream}): the first bit is bit 7 of the
@@ -87,7 +87,7 @@
  *
  * 
As a commodity, an instance of this class will try to cast the underlying byte
  * stream to a {@link RepositionableStream} and to fetch by reflection the {@link
- * java.nio.channels.FileChannel} underlying the given input stream, in this
+ * FileChannel} underlying the given input stream, in this
  * order.  If either reference can be successfully fetched, you can use
  * directly the {@link #position(long) position()} method with argument
  * pos with the same semantics of a {@link #flush()}, followed by
@@ -99,7 +99,7 @@
  * 
  • Finally, this class implements partially the interface of a boolean iterator.
  * More precisely, {@link #nextBoolean()} will return the same bit as {@link #readBit()},
  * and also the same exceptions, whereas {@link #hasNext()} will always return true:
- * you must be prepared to catch a {@link java.lang.RuntimeException} wrapping an {@link IOException}
+ * you must be prepared to catch a {@link RuntimeException} wrapping an {@link IOException}
  * in case the file ends. It
  * is very difficult to implement completely an eager operator using a input-stream
  * based model.
@@ -109,8 +109,8 @@
  * 
    This class is not synchronised. If multiple threads
  * access an instance of this class concurrently, they must be synchronised externally.
  *
- * @see java.io.InputStream
- * @see it.unimi.dsi.io.OutputBitStream
+ * @see InputStream
+ * @see OutputBitStream
  * @author Sebastiano Vigna
  * @since 0.1
  */
@@ -361,7 +361,7 @@ public InputBitStream(final File file, final int bufSize) throws FileNotFoundExc
 	 *
 	 * 
    This method is provided so that users of this class can easily wrap repositionable
 	 * streams (for instance, file-based streams, which can be repositioned using
-	 * the underlying {@link java.nio.channels.FileChannel}). It is guaranteed that after calling
+	 * the underlying {@link FileChannel}). It is guaranteed that after calling
 	 * this method the underlying stream can be repositioned, and that the next read
 	 * will draw data from the stream.
 	 */
@@ -753,21 +753,21 @@ public long skip(long n) throws IOException {
 		}
 	}
 
-	/** Sets this stream bit position, if it is based on a {@link RepositionableStream} or on a {@link java.nio.channels.FileChannel}.
+	/** Sets this stream bit position, if it is based on a {@link RepositionableStream} or on a {@link FileChannel}.
 	 *
 	 * 
    Given an underlying stream that implements {@link
 	 * RepositionableStream} or that can provide a {@link
-	 * java.nio.channels.FileChannel} via the getChannel() method,
+	 * FileChannel} via the getChannel() method,
 	 * a call to this method has the same semantics of a {@link #flush()},
 	 * followed by a call to {@link
-	 * java.nio.channels.FileChannel#position(long) position(position / 8)} on
+	 * FileChannel#position(long) position(position / 8)} on
 	 * the byte stream, followed by a {@link #skip(long) skip(position % 8)}.
 	 *
 	 * 
    Note that this method does not change the value returned by {@link #readBits()}.
 	 *
 	 * @param position the new position expressed as a bit offset.
 	 * @throws UnsupportedOperationException if the underlying byte stream does not implement
-	 * {@link RepositionableStream} or if the channel it returns is not a {@link java.nio.channels.FileChannel}.
+	 * {@link RepositionableStream} or if the channel it returns is not a {@link FileChannel}.
 	 * @see FileChannel#position(long)
 	 */
 
diff --git a/src/it/unimi/dsi/io/LineIterator.java b/src/main/java/it/unimi/dsi/io/LineIterator.java
similarity index 100%
rename from src/it/unimi/dsi/io/LineIterator.java
rename to src/main/java/it/unimi/dsi/io/LineIterator.java
diff --git a/src/it/unimi/dsi/io/LineWordReader.java b/src/main/java/it/unimi/dsi/io/LineWordReader.java
similarity index 92%
rename from src/it/unimi/dsi/io/LineWordReader.java
rename to src/main/java/it/unimi/dsi/io/LineWordReader.java
index 5f9b1e1..c6545cc 100644
--- a/src/it/unimi/dsi/io/LineWordReader.java
+++ b/src/main/java/it/unimi/dsi/io/LineWordReader.java
@@ -25,12 +25,12 @@
 
 import it.unimi.dsi.lang.MutableString;
 
-/** A trivial {@link it.unimi.dsi.io.WordReader} that considers each line
+/** A trivial {@link WordReader} that considers each line
  * of a document a single word.
  *
  * 
    The intended usage of this class is that of indexing stuff like lists of document
  * identifiers: if the identifiers contain nonalphabetical characters, the default
- * {@link it.unimi.dsi.io.FastBufferedReader} might do a poor job.
+ * {@link FastBufferedReader} might do a poor job.
  *
  * 
    Note that the non-word returned by {@link #next(MutableString, MutableString)} is
  * always empty.
diff --git a/src/it/unimi/dsi/io/MultipleInputStream.java b/src/main/java/it/unimi/dsi/io/MultipleInputStream.java
similarity index 100%
rename from src/it/unimi/dsi/io/MultipleInputStream.java
rename to src/main/java/it/unimi/dsi/io/MultipleInputStream.java
diff --git a/src/it/unimi/dsi/io/NullInputStream.java b/src/main/java/it/unimi/dsi/io/NullInputStream.java
similarity index 100%
rename from src/it/unimi/dsi/io/NullInputStream.java
rename to src/main/java/it/unimi/dsi/io/NullInputStream.java
diff --git a/src/it/unimi/dsi/io/NullOutputStream.java b/src/main/java/it/unimi/dsi/io/NullOutputStream.java
similarity index 95%
rename from src/it/unimi/dsi/io/NullOutputStream.java
rename to src/main/java/it/unimi/dsi/io/NullOutputStream.java
index d0bf82d..800b2b6 100644
--- a/src/it/unimi/dsi/io/NullOutputStream.java
+++ b/src/main/java/it/unimi/dsi/io/NullOutputStream.java
@@ -29,7 +29,7 @@
  * 
    This stream discards whatever is written into it. Its usefulness is in
  * previewing the length of some coding by wrapping it in an {@link
  * OutputBitStream} (it is a good idea, in this case, {@linkplain
- * OutputBitStream#OutputBitStream(java.io.OutputStream,int) to specify a 0-length buffer}).
+ * OutputBitStream#OutputBitStream(OutputStream,int) to specify a 0-length buffer}).
  *
  * 
    This class is a singleton. You cannot create a null output stream,
  * but you can obtain an instance of this class using {@link #getInstance()}.
diff --git a/src/it/unimi/dsi/io/NullReader.java b/src/main/java/it/unimi/dsi/io/NullReader.java
similarity index 100%
rename from src/it/unimi/dsi/io/NullReader.java
rename to src/main/java/it/unimi/dsi/io/NullReader.java
diff --git a/src/it/unimi/dsi/io/OfflineIterable.java b/src/main/java/it/unimi/dsi/io/OfflineIterable.java
similarity index 95%
rename from src/it/unimi/dsi/io/OfflineIterable.java
rename to src/main/java/it/unimi/dsi/io/OfflineIterable.java
index 9810a8c..5db3e45 100644
--- a/src/it/unimi/dsi/io/OfflineIterable.java
+++ b/src/main/java/it/unimi/dsi/io/OfflineIterable.java
@@ -37,19 +37,19 @@
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 
 /** An iterable that offers elements that were previously stored offline using specialized
- *  serialization methods. At construction, you provide a {@linkplain #OfflineIterable(it.unimi.dsi.io.OfflineIterable.Serializer, Object) serializer}
+ *  serialization methods. At construction, you provide a {@linkplain #OfflineIterable(Serializer, Object) serializer}
  *  that establishes how elements are written offline; after that, you can
  *  {@linkplain #add(Object) add elements} one at a time or in a {@linkplain #addAll(Iterable) bulk way}.
- *  At any moment, you can {@linkplain #iterator() get} an {@link OfflineIterable.OfflineIterator OfflineIterator}
+ *  At any moment, you can {@linkplain #iterator() get} an {@link OfflineIterator OfflineIterator}
  *  on this object that returns all the elements added so far. Note that the returned iterator caches the current number of elements,
  *  so each iterator will return just the elements added at the time of its creation.
  *
- *  
    Warning: The store object provided at {@linkplain OfflineIterable#OfflineIterable(it.unimi.dsi.io.OfflineIterable.Serializer, Object)
+ *  
    Warning: The store object provided at {@linkplain OfflineIterable#OfflineIterable(Serializer, Object)
  *  construction time} is shared by all iterators.
  *
  *  
    Closing
    
  *
- *  
    Both {@link OfflineIterable} and {@link OfflineIterable.OfflineIterator OfflineIterator} are {@link SafelyCloseable} (the latter will
+ *  
    Both {@link OfflineIterable} and {@link OfflineIterator OfflineIterator} are {@link SafelyCloseable} (the latter will
  *  close its input stream when hasNext() returns false), but for better resource management you should close them after usage.
  *
  * @author Sebastiano Vigna
diff --git a/src/it/unimi/dsi/io/OutputBitStream.java b/src/main/java/it/unimi/dsi/io/OutputBitStream.java
similarity index 98%
rename from src/it/unimi/dsi/io/OutputBitStream.java
rename to src/main/java/it/unimi/dsi/io/OutputBitStream.java
index f1b8f98..0a5807a 100644
--- a/src/it/unimi/dsi/io/OutputBitStream.java
+++ b/src/main/java/it/unimi/dsi/io/OutputBitStream.java
@@ -46,7 +46,7 @@
  * 
    This class can also {@linkplain #OutputBitStream(byte[]) wrap a byte
  * array}; this is much more lightweight than wrapping a {@link
  * it.unimi.dsi.fastutil.io.FastByteArrayOutputStream} wrapping the array, but overflowing the array
- * will cause an {@link java.io.IOException}.
+ * will cause an {@link IOException}.
  *
  * 
    Note that when writing using a vector of bytes bits are written in the natural
  * way: the first bit is bit 7 of the first byte, the eighth bit is bit 0 of
@@ -94,7 +94,7 @@
  *
  * 
    As a commodity, an instance of this class will try to cast the underlying
  * byte stream to a {@link RepositionableStream} and to fetch by reflection the
- * {@link java.nio.channels.FileChannel} underlying the given output stream, in
+ * {@link FileChannel} underlying the given output stream, in
  * this order.  If either reference can be successfully fetched, you can use
  * directly the {@link #position(long) position()} method with argument
  * pos with the same semantics of a {@link #flush()}, followed by
@@ -109,8 +109,8 @@
  * 
    This class	 is not synchronised. If multiple threads
  * access an instance of this class concurrently, they must be synchronised externally.
  *
- * @see java.io.OutputStream
- * @see it.unimi.dsi.io.InputBitStream
+ * @see OutputStream
+ * @see InputBitStream
  * @author Sebastiano Vigna
  * @since 0.1
  */
@@ -338,7 +338,7 @@ public OutputBitStream(final File file) throws FileNotFoundException {
 	 * 
    This method is provided so that users of this class can easily wrap
 	 * repositionable streams (for instance, file-based streams, which can be
 	 * repositioned using the underlying {@link
-	 * java.nio.channels.FileChannel}). 
     It is guaranteed that after calling
+	 * FileChannel}). 
     It is guaranteed that after calling
 	 * this method the underlying stream can be repositioned, and that the next
 	 * write to the underlying output stream will start with the content of the
 	 * first write method called afterwards.
@@ -464,21 +464,21 @@ public int align() throws IOException {
 		else return 0;
 	}
 
-	/** Sets this stream bit position, if it is based  on a {@link RepositionableStream} or on a {@link java.nio.channels.FileChannel}.
+	/** Sets this stream bit position, if it is based  on a {@link RepositionableStream} or on a {@link FileChannel}.
 	 *
 	 * 
    Given an underlying stream that implements {@link
 	 * RepositionableStream} or that can provide a {@link
-	 * java.nio.channels.FileChannel} via the getChannel() method,
+	 * FileChannel} via the getChannel() method,
 	 * a call to this method has the same semantics of a {@link #flush()},
 	 * followed by a call to {@link
-	 * java.nio.channels.FileChannel#position(long) position(position / 8)} on
+	 * FileChannel#position(long) position(position / 8)} on
 	 * the byte stream. Currently there is no clean, working way of supporting
 	 * out-of-byte-boundary positioning.
 	 *
 	 * @param position the new position expressed as a bit offset; it must be byte-aligned.
 	 * @throws IllegalArgumentException when trying to position outside of byte boundaries.
 	 * @throws UnsupportedOperationException if the underlying byte stream does not implement
-	 * {@link RepositionableStream} and if the channel it returns is not a {@link java.nio.channels.FileChannel}.
+	 * {@link RepositionableStream} and if the channel it returns is not a {@link FileChannel}.
 	 * @see FileChannel#position(long)
 	 */
 
diff --git a/src/it/unimi/dsi/io/SafelyCloseable.java b/src/main/java/it/unimi/dsi/io/SafelyCloseable.java
similarity index 95%
rename from src/it/unimi/dsi/io/SafelyCloseable.java
rename to src/main/java/it/unimi/dsi/io/SafelyCloseable.java
index 590446c..2e57de3 100644
--- a/src/it/unimi/dsi/io/SafelyCloseable.java
+++ b/src/main/java/it/unimi/dsi/io/SafelyCloseable.java
@@ -28,7 +28,7 @@
  * finaliser that closes the resource and logs that resource should have been closed.
  *
  * 
    When the implementing class is abstract, concrete subclasses must
- * call super.close() in their own {@link java.io.Closeable#close()} method
+ * call super.close() in their own {@link Closeable#close()} method
  * to let the abstract class track correctly the resource. Moreover,
  * they must run super.finalize() in
  * their own finaliser (if any), as finalisation chaining is not automatic.
diff --git a/src/it/unimi/dsi/io/SegmentedInputStream.java b/src/main/java/it/unimi/dsi/io/SegmentedInputStream.java
similarity index 99%
rename from src/it/unimi/dsi/io/SegmentedInputStream.java
rename to src/main/java/it/unimi/dsi/io/SegmentedInputStream.java
index 2c29c28..b51c739 100644
--- a/src/it/unimi/dsi/io/SegmentedInputStream.java
+++ b/src/main/java/it/unimi/dsi/io/SegmentedInputStream.java
@@ -31,7 +31,7 @@
 import it.unimi.dsi.fastutil.io.MeasurableInputStream;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 
-/** Exhibits a single {@link InputStream} as a number of streams divided into {@link java.io.InputStream#reset() reset()}-separated
+/** Exhibits a single {@link InputStream} as a number of streams divided into {@link InputStream#reset() reset()}-separated
  * segments.
  *
  * 
    An instance of this class wraps a given input stream (usually a replicable one, such as
diff --git a/src/it/unimi/dsi/io/WordReader.java b/src/main/java/it/unimi/dsi/io/WordReader.java
similarity index 91%
rename from src/it/unimi/dsi/io/WordReader.java
rename to src/main/java/it/unimi/dsi/io/WordReader.java
index 6cc303c..1b60a7b 100644
--- a/src/it/unimi/dsi/io/WordReader.java
+++ b/src/main/java/it/unimi/dsi/io/WordReader.java
@@ -28,7 +28,7 @@
 /** An interface providing methods to break the input from a reader into words.
  *
  * 
    The intended implementations of this interface should decorate
- * a given reader (see, for instance, {@link it.unimi.dsi.io.FastBufferedReader}).
+ * a given reader (see, for instance, {@link FastBufferedReader}).
  * The reader can be changed at any time using {@link #setReader(Reader)}.
  *
  * 
    This interface is heavily oriented towards reusability and
@@ -37,9 +37,9 @@
  * and that implementations may completely avoid object creation by
  * {@linkplain #setReader(Reader) setting explicitly the underlying reader}.
  *
- * 
    The standard implementation ({@link it.unimi.dsi.io.FastBufferedReader}) breaks
+ * 
    The standard implementation ({@link FastBufferedReader}) breaks
  * words in the trivial way. More complex implementations (e.g., for languages requiring
- * segmentation) can subclass {@link it.unimi.dsi.io.FastBufferedReader} or provide their
+ * segmentation) can subclass {@link FastBufferedReader} or provide their
  * own implementation.
  */
 
diff --git a/src/it/unimi/dsi/io/package-info.java b/src/main/java/it/unimi/dsi/io/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/io/package-info.java
rename to src/main/java/it/unimi/dsi/io/package-info.java
diff --git a/src/it/unimi/dsi/lang/EnumStringParser.java b/src/main/java/it/unimi/dsi/lang/EnumStringParser.java
similarity index 96%
rename from src/it/unimi/dsi/lang/EnumStringParser.java
rename to src/main/java/it/unimi/dsi/lang/EnumStringParser.java
index a8afca2..0d28fe9 100644
--- a/src/it/unimi/dsi/lang/EnumStringParser.java
+++ b/src/main/java/it/unimi/dsi/lang/EnumStringParser.java
@@ -23,7 +23,7 @@
 import com.martiansoftware.jsap.StringParser;
 
 /**
- * A {@link com.martiansoftware.jsap.StringParser StringParser} that makes the user choose among
+ * A {@link StringParser StringParser} that makes the user choose among
  * items of a Java {@code enum}.
  *
  * 
    Optionally, parsed strings can be normalized to upper case.
diff --git a/src/it/unimi/dsi/lang/FlyweightPrototype.java b/src/main/java/it/unimi/dsi/lang/FlyweightPrototype.java
similarity index 100%
rename from src/it/unimi/dsi/lang/FlyweightPrototype.java
rename to src/main/java/it/unimi/dsi/lang/FlyweightPrototype.java
diff --git a/src/it/unimi/dsi/lang/FlyweightPrototypes.java b/src/main/java/it/unimi/dsi/lang/FlyweightPrototypes.java
similarity index 91%
rename from src/it/unimi/dsi/lang/FlyweightPrototypes.java
rename to src/main/java/it/unimi/dsi/lang/FlyweightPrototypes.java
index 8745de0..2db2749 100644
--- a/src/it/unimi/dsi/lang/FlyweightPrototypes.java
+++ b/src/main/java/it/unimi/dsi/lang/FlyweightPrototypes.java
@@ -22,14 +22,14 @@
 import java.lang.reflect.Array;
 
 /** A class providing static methods and objects that do useful things
- * with {@linkplain it.unimi.dsi.lang.FlyweightPrototype flyweight protoypes}.
+ * with {@linkplain FlyweightPrototype flyweight protoypes}.
  */
 
 public class FlyweightPrototypes {
 
 	protected FlyweightPrototypes() {}
 
-	/** Creates a flyweight copy of an array of {@linkplain it.unimi.dsi.lang.FlyweightPrototype flyweight prototypes}.
+	/** Creates a flyweight copy of an array of {@linkplain FlyweightPrototype flyweight prototypes}.
 	 *
 	 * @param  the type of {@link FlyweightPrototype} you want to copy, that is, the
 	 * type of the elements of prototype.
diff --git a/src/it/unimi/dsi/lang/MutableString.java b/src/main/java/it/unimi/dsi/lang/MutableString.java
similarity index 99%
rename from src/it/unimi/dsi/lang/MutableString.java
rename to src/main/java/it/unimi/dsi/lang/MutableString.java
index 505c22e..0128474 100644
--- a/src/it/unimi/dsi/lang/MutableString.java
+++ b/src/main/java/it/unimi/dsi/lang/MutableString.java
@@ -47,7 +47,7 @@
  * 
    Motivation
    
  *
  * 
    
- * The classical Java string classes, {@link java.lang.String} and {@link java.lang.StringBuffer}
+ * The classical Java string classes, {@link String} and {@link StringBuffer}
  * (or {@link StringBuilder}), lie at the extreme of a spectrum (immutable and mutable).
  *
  * 
    
@@ -320,14 +320,14 @@ public Object clone() {
 
 
 	/** Commodity static method implementing {@link
-	 *  java.lang.String#getChars(int,int,char[],int)} for a CharSequences.
+	 *  String#getChars(int,int,char[],int)} for a CharSequences.
 	 *
 	 * @param s a CharSequence.
 	 * @param start copy start from this index (inclusive).
 	 * @param end copy ends at this index (exclusive).
 	 * @param dest destination array.
 	 * @param destStart the first character will be copied in dest[destStart].
-	 * @see java.lang.String#getChars(int,int,char[],int)
+	 * @see String#getChars(int,int,char[],int)
 	 */
 	public static void getChars(final CharSequence s, final int start, final int end, final char[] dest, final int destStart) {
 		int j = destStart, i = start;
@@ -410,7 +410,7 @@ public final void getChars(final int start, final int end, final char[] dest, fi
 	 * 
    
 	 * The new capacity of this string will be exactly equal to the provided argument if this
 	 * mutable string is compact (this differs markedly from
-	 * {@link java.lang.StringBuffer#ensureCapacity(int) StringBuffer}). If this mutable string is
+	 * {@link StringBuffer#ensureCapacity(int) StringBuffer}). If this mutable string is
 	 * loose, the provided argument is maximized with the current capacity doubled.
 	 *
 	 * 
    
@@ -768,8 +768,8 @@ public boolean equals(final Object o) {
 	 * 
    Equality of CharSequences returned by this method is defined by
 	 * content equality, and hash codes are identical to mutable strings with the same
 	 * content. Thus, you can mix mutable strings and CharSequences
-	 * returned by this method in data structures, as the contracts of {@link java.lang.Object#equals(Object) equals()} and
-	 * {@link java.lang.Object#hashCode() hashCode()} are honoured.
+	 * returned by this method in data structures, as the contracts of {@link Object#equals(Object) equals()} and
+	 * {@link Object#hashCode() hashCode()} are honoured.
 	 *
 	 * @param start first character of the subsequence (inclusive).
 	 * @param end last character of the subsequence (exclusive).
@@ -825,7 +825,7 @@ public final MutableString append(final String s) {
 	 * @param s a CharSequence or {@code null}.
 	 * @return this mutable string.
 	 *
-	 * @see Appendable#append(java.lang.CharSequence)
+	 * @see Appendable#append(CharSequence)
 	 */
 	@Override
 	public final MutableString append(final CharSequence s) {
@@ -851,7 +851,7 @@ public final MutableString append(final CharSequence s) {
 	 * @param end the index of the character after the last character in the subsequence.
 	 * @return this mutable string.
 	 *
-	 * @see Appendable#append(java.lang.CharSequence, int, int)
+	 * @see Appendable#append(CharSequence, int, int)
 	 */
 	@Override
 	public final MutableString append(final CharSequence s, final int start, final int end) {
@@ -4298,7 +4298,7 @@ public final MutableString readSelfDelimUTF8(final InputStream s) throws IOExcep
 	 * 
    A potentially nasty consequence is that equality is not symmetric.
 	 * See the discussion in the {@linkplain MutableString class description}.
 	 *
-	 * @param o an {@link java.lang.Object}.
+	 * @param o an {@link Object}.
 	 * @return true if the argument is a CharSequences that contains the same characters of this mutable string.
 	 */
 	@Override
@@ -4381,7 +4381,7 @@ public final boolean equals(final CharSequence s) {
 	 *
 	 * @param s a mutable string.
 	 * @return true if the two mutable strings contain the same characters up to case.
-	 * @see java.lang.String#equalsIgnoreCase(String)
+	 * @see String#equalsIgnoreCase(String)
 	 */
 
 	public final boolean equalsIgnoreCase(final MutableString s) {
@@ -4520,7 +4520,7 @@ public final int compareTo(final CharSequence s) {
 	 * @return a negative integer, zero, or a positive integer as this mutable
 	 * string is less than, equal to, or greater than the specified mutable
 	 * string once case differences have been eliminated.
-	 * @see java.lang.String#compareToIgnoreCase(String)
+	 * @see String#compareToIgnoreCase(String)
 	 */
 
 	public final int compareToIgnoreCase(final MutableString s) {
@@ -4596,10 +4596,10 @@ public final int compareToIgnoreCase(final CharSequence s) {
 	 *
 	 * 
    A compact mutable string caches its hash code, so it is
 	 * very efficient on data structures that check hash codes before invoking
-	 * {@link java.lang.Object#equals(Object) equals()}.
+	 * {@link Object#equals(Object) equals()}.
 	 *
 	 * @return  a hash code array for this object.
-	 * @see java.lang.String#hashCode()
+	 * @see String#hashCode()
 	 */
 	@Override
 	public final int hashCode() {
diff --git a/src/it/unimi/dsi/lang/ObjectParser.java b/src/main/java/it/unimi/dsi/lang/ObjectParser.java
similarity index 100%
rename from src/it/unimi/dsi/lang/ObjectParser.java
rename to src/main/java/it/unimi/dsi/lang/ObjectParser.java
diff --git a/src/it/unimi/dsi/lang/package-info.java b/src/main/java/it/unimi/dsi/lang/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/lang/package-info.java
rename to src/main/java/it/unimi/dsi/lang/package-info.java
diff --git a/src/it/unimi/dsi/logging/ProgressLogger.java b/src/main/java/it/unimi/dsi/logging/ProgressLogger.java
similarity index 100%
rename from src/it/unimi/dsi/logging/ProgressLogger.java
rename to src/main/java/it/unimi/dsi/logging/ProgressLogger.java
diff --git a/src/it/unimi/dsi/logging/package-info.java b/src/main/java/it/unimi/dsi/logging/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/logging/package-info.java
rename to src/main/java/it/unimi/dsi/logging/package-info.java
diff --git a/src/it/unimi/dsi/package-info.java b/src/main/java/it/unimi/dsi/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/package-info.java
rename to src/main/java/it/unimi/dsi/package-info.java
diff --git a/src/it/unimi/dsi/parser/Attribute.java b/src/main/java/it/unimi/dsi/parser/Attribute.java
similarity index 100%
rename from src/it/unimi/dsi/parser/Attribute.java
rename to src/main/java/it/unimi/dsi/parser/Attribute.java
diff --git a/src/it/unimi/dsi/parser/BulletParser.java b/src/main/java/it/unimi/dsi/parser/BulletParser.java
similarity index 96%
rename from src/it/unimi/dsi/parser/BulletParser.java
rename to src/main/java/it/unimi/dsi/parser/BulletParser.java
index 03fca8d..4d2915a 100644
--- a/src/it/unimi/dsi/parser/BulletParser.java
+++ b/src/main/java/it/unimi/dsi/parser/BulletParser.java
@@ -57,26 +57,26 @@
  * The bullet parser is officially StringFree™. MutableStrings
  * are used for internal processing, and Java strings are used only to return attribute values. All
- * internal maps are {@linkplain it.unimi.dsi.fastutil.objects.Reference2ObjectMap reference-based
+ * internal maps are {@linkplain Reference2ObjectMap reference-based
  * maps} from fastutil, which helps to
  * accelerate further the parsing process.
  *
  * 
    HTML data
    
  *
  * 
    
- * The bullet parser uses attributes and methods of {@link it.unimi.dsi.parser.HTMLFactory},
- * {@link it.unimi.dsi.parser.Element}, {@link it.unimi.dsi.parser.Attribute} and
- * {@link it.unimi.dsi.parser.Entity}. Thus, for instance, whenever an element is to be passed
- * around it is one of the shared objects contained in {@link it.unimi.dsi.parser.Element} (e.g.,
- * {@link it.unimi.dsi.parser.Element#BODY}).
+ * The bullet parser uses attributes and methods of {@link HTMLFactory},
+ * {@link Element}, {@link Attribute} and
+ * {@link Entity}. Thus, for instance, whenever an element is to be passed
+ * around it is one of the shared objects contained in {@link Element} (e.g.,
+ * {@link Element#BODY}).
  *
  * 
    Callbacks
    
  *
  * 
    
  * The result of the parsing process is the invocation of a callback. The
- * {@linkplain it.unimi.dsi.parser.callback.Callback callback interface} of the bullet parser
+ * {@linkplain Callback callback interface} of the bullet parser
  * remembers closely SAX2, but it has some additional methods targeted at (X)HTML, such as
- * {@link it.unimi.dsi.parser.callback.Callback#cdata(it.unimi.dsi.parser.Element,char[],int,int)},
+ * {@link Callback#cdata(Element,char[],int,int)},
  * which returns characters found in a CDATA section (e.g., a stylesheet).
  *
  * 
    
@@ -112,11 +112,11 @@
  * value you want to obtain.
  * 
  • text ({@link #parseText(boolean)}method): whether text should be parsed; if this
  * flag is set, the parser will call the
- * {@link it.unimi.dsi.parser.callback.Callback#characters(char[], int, int, boolean)} method for
+ * {@link Callback#characters(char[], int, int, boolean)} method for
  * every text chunk found.
  * 
  • CDATA sections ({@link #parseCDATA(boolean)}method): whether CDATA sections
  * (stylesheets & scripts) should be parsed; if this flag is set, the parser will call the
- * {@link it.unimi.dsi.parser.callback.Callback#cdata(Element,char[],int,int)} method for every
+ * {@link Callback#cdata(Element,char[],int,int)} method for every
  * CDATA section found.
  * 
  *
diff --git a/src/it/unimi/dsi/parser/Element.java b/src/main/java/it/unimi/dsi/parser/Element.java
similarity index 100%
rename from src/it/unimi/dsi/parser/Element.java
rename to src/main/java/it/unimi/dsi/parser/Element.java
diff --git a/src/it/unimi/dsi/parser/Entity.java b/src/main/java/it/unimi/dsi/parser/Entity.java
similarity index 100%
rename from src/it/unimi/dsi/parser/Entity.java
rename to src/main/java/it/unimi/dsi/parser/Entity.java
diff --git a/src/it/unimi/dsi/parser/HTMLFactory.java b/src/main/java/it/unimi/dsi/parser/HTMLFactory.java
similarity index 100%
rename from src/it/unimi/dsi/parser/HTMLFactory.java
rename to src/main/java/it/unimi/dsi/parser/HTMLFactory.java
diff --git a/src/it/unimi/dsi/parser/ParsingFactory.java b/src/main/java/it/unimi/dsi/parser/ParsingFactory.java
similarity index 80%
rename from src/it/unimi/dsi/parser/ParsingFactory.java
rename to src/main/java/it/unimi/dsi/parser/ParsingFactory.java
index e7b7fc1..41ee411 100644
--- a/src/it/unimi/dsi/parser/ParsingFactory.java
+++ b/src/main/java/it/unimi/dsi/parser/ParsingFactory.java
@@ -26,13 +26,13 @@
  * instances.
  *
  * 
    
- * The {@link it.unimi.dsi.parser.BulletParser} needs a way to turn a name (for an element type,
- * attribute, or entity) into a corresponding object of type {@link it.unimi.dsi.parser.Element},
- * {@link it.unimi.dsi.parser.Attribute} or {@link it.unimi.dsi.parser.Entity}, respectively. The
+ * The {@link BulletParser} needs a way to turn a name (for an element type,
+ * attribute, or entity) into a corresponding object of type {@link Element},
+ * {@link Attribute} or {@link Entity}, respectively. The
  * returned element must be an interned, unique representation.
  *
  * 
    
- * For instance, the {@linkplain it.unimi.dsi.parser.HTMLFactory standard factory for HTML} parsing
+ * For instance, the {@linkplain HTMLFactory standard factory for HTML} parsing
  * has ready-made interned versions of all names in the (X)HTML specification, and returns them upon
  * request, but other policies are possible. For instance, instances of {@link WellFormedXmlFactory}
  * intern every seen name, without reference to a data type (except for entities, in which case the
@@ -50,21 +50,21 @@
 @Deprecated
 public interface ParsingFactory {
 
-	/** Returns the {@link it.unimi.dsi.parser.Element} associated
+	/** Returns the {@link Element} associated
 	 * to a name.
 	 * @param name the name of an element type.
 	 * @return the corresponding interned {@link Element} object.
 	 */
 	public Element getElement(final MutableString name);
 
-	/** Returns the {@link it.unimi.dsi.parser.Attribute} associated
+	/** Returns the {@link Attribute} associated
 	 * to a name.
 	 * @param name the name of an attribute.
 	 * @return the corresponding interned {@link Attribute} object.
 	 */
 	public Attribute getAttribute(final MutableString name);
 
-	/** Returns the {@link it.unimi.dsi.parser.Entity} associated
+	/** Returns the {@link Entity} associated
 	 * to a name.
 	 * @param name the name of an entity.
 	 * @return the corresponding interned {@link Entity} object.
diff --git a/src/it/unimi/dsi/parser/WellFormedXmlFactory.java b/src/main/java/it/unimi/dsi/parser/WellFormedXmlFactory.java
similarity index 96%
rename from src/it/unimi/dsi/parser/WellFormedXmlFactory.java
rename to src/main/java/it/unimi/dsi/parser/WellFormedXmlFactory.java
index bbc3219..ce20c3b 100644
--- a/src/it/unimi/dsi/parser/WellFormedXmlFactory.java
+++ b/src/main/java/it/unimi/dsi/parser/WellFormedXmlFactory.java
@@ -28,7 +28,7 @@
  *
  * 
    
  * This factory assumes that every new name of an element type or of an attribute is new valid name.
- * For entities, instead, resolution is deferred to {@link it.unimi.dsi.parser.HTMLFactory}.
+ * For entities, instead, resolution is deferred to {@link HTMLFactory}.
  *
  * @author Sebastiano Vigna
  * @since 1.0.2
diff --git a/src/it/unimi/dsi/parser/callback/Callback.java b/src/main/java/it/unimi/dsi/parser/callback/Callback.java
similarity index 94%
rename from src/it/unimi/dsi/parser/callback/Callback.java
rename to src/main/java/it/unimi/dsi/parser/callback/Callback.java
index ed9af50..67db930 100644
--- a/src/it/unimi/dsi/parser/callback/Callback.java
+++ b/src/main/java/it/unimi/dsi/parser/callback/Callback.java
@@ -27,7 +27,7 @@
 import it.unimi.dsi.parser.Element;
 
 /**
- * A callback for the {@linkplain it.unimi.dsi.parser.BulletParser bullet parser}.
+ * A callback for the {@linkplain BulletParser bullet parser}.
  *
  * 
    
  * This interface is very loosely inspired to the SAX2 interface. However, it strives to be simple,
@@ -71,10 +71,10 @@ public interface Callback {
 	 * callback will ever receive.
 	 *
 	 * @param element the element whose opening tag was found.
-	 * @param attrMap a map from {@link it.unimi.dsi.parser.Attribute}s to {@link MutableString}s.
+	 * @param attrMap a map from {@link Attribute}s to {@link MutableString}s.
 	 * @return true to keep the parser parsing, false to stop it.
 	 */
-	boolean startElement(Element element, Map attrMap);
+	boolean startElement(Element element, Map attrMap);
 
 	/** Receive notification of the end of an element.
 	 *
diff --git a/src/it/unimi/dsi/parser/callback/ComposedCallbackBuilder.java b/src/main/java/it/unimi/dsi/parser/callback/ComposedCallbackBuilder.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/ComposedCallbackBuilder.java
rename to src/main/java/it/unimi/dsi/parser/callback/ComposedCallbackBuilder.java
diff --git a/src/it/unimi/dsi/parser/callback/DebugCallbackDecorator.java b/src/main/java/it/unimi/dsi/parser/callback/DebugCallbackDecorator.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/DebugCallbackDecorator.java
rename to src/main/java/it/unimi/dsi/parser/callback/DebugCallbackDecorator.java
diff --git a/src/it/unimi/dsi/parser/callback/DefaultCallback.java b/src/main/java/it/unimi/dsi/parser/callback/DefaultCallback.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/DefaultCallback.java
rename to src/main/java/it/unimi/dsi/parser/callback/DefaultCallback.java
diff --git a/src/it/unimi/dsi/parser/callback/LinkExtractor.java b/src/main/java/it/unimi/dsi/parser/callback/LinkExtractor.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/LinkExtractor.java
rename to src/main/java/it/unimi/dsi/parser/callback/LinkExtractor.java
diff --git a/src/it/unimi/dsi/parser/callback/TextExtractor.java b/src/main/java/it/unimi/dsi/parser/callback/TextExtractor.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/TextExtractor.java
rename to src/main/java/it/unimi/dsi/parser/callback/TextExtractor.java
diff --git a/src/it/unimi/dsi/parser/callback/package-info.java b/src/main/java/it/unimi/dsi/parser/callback/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/parser/callback/package-info.java
rename to src/main/java/it/unimi/dsi/parser/callback/package-info.java
diff --git a/src/it/unimi/dsi/parser/package-info.java b/src/main/java/it/unimi/dsi/parser/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/parser/package-info.java
rename to src/main/java/it/unimi/dsi/parser/package-info.java
diff --git a/src/it/unimi/dsi/stat/Jackknife.java b/src/main/java/it/unimi/dsi/stat/Jackknife.java
similarity index 99%
rename from src/it/unimi/dsi/stat/Jackknife.java
rename to src/main/java/it/unimi/dsi/stat/Jackknife.java
index fa1f11c..c5b3bb8 100644
--- a/src/it/unimi/dsi/stat/Jackknife.java
+++ b/src/main/java/it/unimi/dsi/stat/Jackknife.java
@@ -102,7 +102,7 @@ public static interface Statistic {
 	}
 
 	/** A statistic that returns the sample. Useful to compute the average and the empirical standard error. */
-	public static Jackknife.Statistic IDENTITY = (sample, unused) -> sample;
+	public static Statistic IDENTITY = (sample, unused) -> sample;
 
 	/** An abstract statistic with a {@linkplain #compute(double[]) template method} that
 	 * accepts an array of doubles, returns an array of doubles and handles the data conversions that
diff --git a/src/it/unimi/dsi/stat/SummaryStats.java b/src/main/java/it/unimi/dsi/stat/SummaryStats.java
similarity index 100%
rename from src/it/unimi/dsi/stat/SummaryStats.java
rename to src/main/java/it/unimi/dsi/stat/SummaryStats.java
diff --git a/src/it/unimi/dsi/stat/Ziggurat.java b/src/main/java/it/unimi/dsi/stat/Ziggurat.java
similarity index 100%
rename from src/it/unimi/dsi/stat/Ziggurat.java
rename to src/main/java/it/unimi/dsi/stat/Ziggurat.java
diff --git a/src/it/unimi/dsi/stat/package-info.java b/src/main/java/it/unimi/dsi/stat/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/stat/package-info.java
rename to src/main/java/it/unimi/dsi/stat/package-info.java
diff --git a/src/it/unimi/dsi/test/GeneratePrecomputedCodes.java b/src/main/java/it/unimi/dsi/test/GeneratePrecomputedCodes.java
similarity index 100%
rename from src/it/unimi/dsi/test/GeneratePrecomputedCodes.java
rename to src/main/java/it/unimi/dsi/test/GeneratePrecomputedCodes.java
diff --git a/src/it/unimi/dsi/test/GeneratePrecomputedOutputCodes.java b/src/main/java/it/unimi/dsi/test/GeneratePrecomputedOutputCodes.java
similarity index 100%
rename from src/it/unimi/dsi/test/GeneratePrecomputedOutputCodes.java
rename to src/main/java/it/unimi/dsi/test/GeneratePrecomputedOutputCodes.java
diff --git a/src/it/unimi/dsi/test/InputBitStreamSpeedTest.java b/src/main/java/it/unimi/dsi/test/InputBitStreamSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/InputBitStreamSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/InputBitStreamSpeedTest.java
diff --git a/src/it/unimi/dsi/test/LeastSignificantBitSpeedTest.java b/src/main/java/it/unimi/dsi/test/LeastSignificantBitSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/LeastSignificantBitSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/LeastSignificantBitSpeedTest.java
diff --git a/src/it/unimi/dsi/test/MutableStringLengthSpeedTest.java b/src/main/java/it/unimi/dsi/test/MutableStringLengthSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/MutableStringLengthSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/MutableStringLengthSpeedTest.java
diff --git a/src/it/unimi/dsi/test/MutableStringRegressionTest.java b/src/main/java/it/unimi/dsi/test/MutableStringRegressionTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/MutableStringRegressionTest.java
rename to src/main/java/it/unimi/dsi/test/MutableStringRegressionTest.java
diff --git a/src/it/unimi/dsi/test/MutableStringReplaceSpeedTest.java b/src/main/java/it/unimi/dsi/test/MutableStringReplaceSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/MutableStringReplaceSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/MutableStringReplaceSpeedTest.java
diff --git a/src/it/unimi/dsi/test/RandomSpeed.java b/src/main/java/it/unimi/dsi/test/RandomSpeed.java
similarity index 100%
rename from src/it/unimi/dsi/test/RandomSpeed.java
rename to src/main/java/it/unimi/dsi/test/RandomSpeed.java
diff --git a/src/it/unimi/dsi/test/StringMapSpeedTest.java b/src/main/java/it/unimi/dsi/test/StringMapSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/StringMapSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/StringMapSpeedTest.java
diff --git a/src/it/unimi/dsi/test/TextPatternSpeedTest.java b/src/main/java/it/unimi/dsi/test/TextPatternSpeedTest.java
similarity index 100%
rename from src/it/unimi/dsi/test/TextPatternSpeedTest.java
rename to src/main/java/it/unimi/dsi/test/TextPatternSpeedTest.java
diff --git a/src/it/unimi/dsi/test/WTF.java b/src/main/java/it/unimi/dsi/test/WTF.java
similarity index 100%
rename from src/it/unimi/dsi/test/WTF.java
rename to src/main/java/it/unimi/dsi/test/WTF.java
diff --git a/src/it/unimi/dsi/test/XorShift.java b/src/main/java/it/unimi/dsi/test/XorShift.java
similarity index 100%
rename from src/it/unimi/dsi/test/XorShift.java
rename to src/main/java/it/unimi/dsi/test/XorShift.java
diff --git a/src/it/unimi/dsi/test/XorShiftPoly.java b/src/main/java/it/unimi/dsi/test/XorShiftPoly.java
similarity index 100%
rename from src/it/unimi/dsi/test/XorShiftPoly.java
rename to src/main/java/it/unimi/dsi/test/XorShiftPoly.java
diff --git a/src/it/unimi/dsi/test/XorShiftPoly116.java b/src/main/java/it/unimi/dsi/test/XorShiftPoly116.java
similarity index 100%
rename from src/it/unimi/dsi/test/XorShiftPoly116.java
rename to src/main/java/it/unimi/dsi/test/XorShiftPoly116.java
diff --git a/src/it/unimi/dsi/test/XorShiftPoly928.java b/src/main/java/it/unimi/dsi/test/XorShiftPoly928.java
similarity index 100%
rename from src/it/unimi/dsi/test/XorShiftPoly928.java
rename to src/main/java/it/unimi/dsi/test/XorShiftPoly928.java
diff --git a/src/it/unimi/dsi/util/AbstractPrefixMap.java b/src/main/java/it/unimi/dsi/util/AbstractPrefixMap.java
similarity index 100%
rename from src/it/unimi/dsi/util/AbstractPrefixMap.java
rename to src/main/java/it/unimi/dsi/util/AbstractPrefixMap.java
diff --git a/src/it/unimi/dsi/util/BloomFilter.java b/src/main/java/it/unimi/dsi/util/BloomFilter.java
similarity index 100%
rename from src/it/unimi/dsi/util/BloomFilter.java
rename to src/main/java/it/unimi/dsi/util/BloomFilter.java
diff --git a/src/it/unimi/dsi/util/ByteBufferLongBigList.java b/src/main/java/it/unimi/dsi/util/ByteBufferLongBigList.java
similarity index 98%
rename from src/it/unimi/dsi/util/ByteBufferLongBigList.java
rename to src/main/java/it/unimi/dsi/util/ByteBufferLongBigList.java
index cd6ba62..18a1d4e 100644
--- a/src/it/unimi/dsi/util/ByteBufferLongBigList.java
+++ b/src/main/java/it/unimi/dsi/util/ByteBufferLongBigList.java
@@ -42,7 +42,7 @@
  * Java's {@linkplain FileChannel#map(MapMode, long, long) memory-mapping facilities} have the
  * severe limitation of mapping at most {@link Integer#MAX_VALUE} bytes, as they expose the content
  * of a file using a {@link MappedByteBuffer}. This class can
- * {@linkplain #map(FileChannel, ByteOrder, FileChannel.MapMode) expose a file of longs of arbitrary
+ * {@linkplain #map(FileChannel, ByteOrder, MapMode) expose a file of longs of arbitrary
  * length} as a {@link LongBigList} that is actually based on an array of {@link MappedByteBuffer}s,
  * each mapping a chunk of {@link #CHUNK_SIZE} longs.
  *
@@ -58,7 +58,7 @@
 public class ByteBufferLongBigList extends AbstractLongBigList implements FlyweightPrototype  {
 	private static int CHUNK_SHIFT = 27;
 
-	/** The size in longs of a chunk created by {@link #map(FileChannel, ByteOrder, FileChannel.MapMode)}. */
+	/** The size in longs of a chunk created by {@link #map(FileChannel, ByteOrder, MapMode)}. */
 	public static final long CHUNK_SIZE = 1L << CHUNK_SHIFT;
 
 	/** The mask used to compute the offset in the chunk in longs. */
diff --git a/src/it/unimi/dsi/util/CircularCharArrayBuffer.java b/src/main/java/it/unimi/dsi/util/CircularCharArrayBuffer.java
similarity index 100%
rename from src/it/unimi/dsi/util/CircularCharArrayBuffer.java
rename to src/main/java/it/unimi/dsi/util/CircularCharArrayBuffer.java
diff --git a/src/it/unimi/dsi/util/FrontCodedStringList.java b/src/main/java/it/unimi/dsi/util/FrontCodedStringList.java
similarity index 100%
rename from src/it/unimi/dsi/util/FrontCodedStringList.java
rename to src/main/java/it/unimi/dsi/util/FrontCodedStringList.java
diff --git a/src/it/unimi/dsi/util/HyperLogLogCounterArray.java b/src/main/java/it/unimi/dsi/util/HyperLogLogCounterArray.java
similarity index 100%
rename from src/it/unimi/dsi/util/HyperLogLogCounterArray.java
rename to src/main/java/it/unimi/dsi/util/HyperLogLogCounterArray.java
diff --git a/src/it/unimi/dsi/util/ImmutableBinaryTrie.java b/src/main/java/it/unimi/dsi/util/ImmutableBinaryTrie.java
similarity index 99%
rename from src/it/unimi/dsi/util/ImmutableBinaryTrie.java
rename to src/main/java/it/unimi/dsi/util/ImmutableBinaryTrie.java
index 98d1abb..da4d073 100644
--- a/src/it/unimi/dsi/util/ImmutableBinaryTrie.java
+++ b/src/main/java/it/unimi/dsi/util/ImmutableBinaryTrie.java
@@ -411,7 +411,7 @@ public Interval getInterval(final BooleanIterator iterator) {
 	 * the last word extending w would be in the word interval given by the right
 	 * extreme of the interval returned by this method. If no word in the larger set could possibly extend
 	 * w (because w is smaller than the lexicographically smallest word in the approximator)
-	 * the result is just an {@linkplain it.unimi.dsi.util.Intervals#EMPTY_INTERVAL empty interval}.
+	 * the result is just an {@linkplain Intervals#EMPTY_INTERVAL empty interval}.
 	 *
 	 * @param element an element.
 	 * @return an approximated interval around the specified word.
diff --git a/src/it/unimi/dsi/util/ImmutableExternalPrefixMap.java b/src/main/java/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
similarity index 99%
rename from src/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
rename to src/main/java/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
index 3763152..677c697 100644
--- a/src/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
+++ b/src/main/java/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
@@ -72,7 +72,7 @@
  * of the prefix map. More precisely, the dump stream is formed by blocks, and each
  * block (with user-definable length, possibly the size of a basic disk I/O operation)
  * is filled as much as possible with strings front coded and compressed with a
- * {@link it.unimi.dsi.compression.HuTuckerCodec}.
+ * {@link HuTuckerCodec}.
  * Each block starts with the length of the first string in unary, followed by the encoding of the
  * string. Then, for each string we write in unary the length of the common prefix (in characters)
  * with the previous string, the length of the remaining suffix (in characters)
@@ -100,7 +100,7 @@
  * can be serialised, but after deserialisation
  * you need to set the {@linkplain #setDumpStream(CharSequence) dump stream filename}
  * or even directly the {@linkplain #setDumpStream(InputBitStream) dump stream} (for instance, to
- * an {@linkplain it.unimi.dsi.io.InputBitStream#InputBitStream(byte[]) input bit stream
+ * an {@linkplain InputBitStream#InputBitStream(byte[]) input bit stream
  * wrapping a byte array where the dump stream has been loaded}). You can deserialise many
  * copies of an external prefix map, letting all copies share the same dump stream.
  *
diff --git a/src/it/unimi/dsi/util/IntParallelCounterArray.java b/src/main/java/it/unimi/dsi/util/IntParallelCounterArray.java
similarity index 100%
rename from src/it/unimi/dsi/util/IntParallelCounterArray.java
rename to src/main/java/it/unimi/dsi/util/IntParallelCounterArray.java
diff --git a/src/it/unimi/dsi/util/Interval.java b/src/main/java/it/unimi/dsi/util/Interval.java
similarity index 99%
rename from src/it/unimi/dsi/util/Interval.java
rename to src/main/java/it/unimi/dsi/util/Interval.java
index cdfd88a..ad8d579 100644
--- a/src/it/unimi/dsi/util/Interval.java
+++ b/src/main/java/it/unimi/dsi/util/Interval.java
@@ -42,7 +42,7 @@
  * {@link #valueOf(int, int)} and {@link #valueOf(int)}, instead.
  *
  * 
    Instances of this class are immutable, and moreover implement
- * the {@link it.unimi.dsi.fastutil.ints.IntSortedSet} interface. The
+ * the {@link IntSortedSet} interface. The
  * {@linkplain #equals(Object) equality method} allows to check equality with
  * both sorted and non-sorted sets of integers.
  *
diff --git a/src/it/unimi/dsi/util/Intervals.java b/src/main/java/it/unimi/dsi/util/Intervals.java
similarity index 100%
rename from src/it/unimi/dsi/util/Intervals.java
rename to src/main/java/it/unimi/dsi/util/Intervals.java
diff --git a/src/it/unimi/dsi/util/KahanSummation.java b/src/main/java/it/unimi/dsi/util/KahanSummation.java
similarity index 100%
rename from src/it/unimi/dsi/util/KahanSummation.java
rename to src/main/java/it/unimi/dsi/util/KahanSummation.java
diff --git a/src/it/unimi/dsi/util/LiterallySignedStringMap.java b/src/main/java/it/unimi/dsi/util/LiterallySignedStringMap.java
similarity index 100%
rename from src/it/unimi/dsi/util/LiterallySignedStringMap.java
rename to src/main/java/it/unimi/dsi/util/LiterallySignedStringMap.java
diff --git a/src/it/unimi/dsi/util/LongInterval.java b/src/main/java/it/unimi/dsi/util/LongInterval.java
similarity index 100%
rename from src/it/unimi/dsi/util/LongInterval.java
rename to src/main/java/it/unimi/dsi/util/LongInterval.java
diff --git a/src/it/unimi/dsi/util/LongIntervals.java b/src/main/java/it/unimi/dsi/util/LongIntervals.java
similarity index 100%
rename from src/it/unimi/dsi/util/LongIntervals.java
rename to src/main/java/it/unimi/dsi/util/LongIntervals.java
diff --git a/src/it/unimi/dsi/util/PermutedFrontCodedStringList.java b/src/main/java/it/unimi/dsi/util/PermutedFrontCodedStringList.java
similarity index 97%
rename from src/it/unimi/dsi/util/PermutedFrontCodedStringList.java
rename to src/main/java/it/unimi/dsi/util/PermutedFrontCodedStringList.java
index cafb993..e1f663e 100644
--- a/src/it/unimi/dsi/util/PermutedFrontCodedStringList.java
+++ b/src/main/java/it/unimi/dsi/util/PermutedFrontCodedStringList.java
@@ -39,12 +39,12 @@
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
 import it.unimi.dsi.lang.MutableString;
 
-/** A {@link it.unimi.dsi.util.FrontCodedStringList} whose indices are permuted.
+/** A {@link FrontCodedStringList} whose indices are permuted.
  *
  * 
    It may happen that a list of strings compresses very well
  * using front coding, but unfortunately alphabetical order is not
  * the right order for the strings in the list. Instances of this class
- * wrap an instance of {@link it.unimi.dsi.util.FrontCodedStringList}
+ * wrap an instance of {@link FrontCodedStringList}
  * together with a permutation π: inquiries with index i will
  * actually return the string with index πi.
  *
diff --git a/src/it/unimi/dsi/util/PrefixMap.java b/src/main/java/it/unimi/dsi/util/PrefixMap.java
similarity index 100%
rename from src/it/unimi/dsi/util/PrefixMap.java
rename to src/main/java/it/unimi/dsi/util/PrefixMap.java
diff --git a/src/it/unimi/dsi/util/Properties.java b/src/main/java/it/unimi/dsi/util/Properties.java
similarity index 96%
rename from src/it/unimi/dsi/util/Properties.java
rename to src/main/java/it/unimi/dsi/util/Properties.java
index 4208aac..d83825d 100644
--- a/src/it/unimi/dsi/util/Properties.java
+++ b/src/main/java/it/unimi/dsi/util/Properties.java
@@ -45,16 +45,16 @@
 import org.apache.commons.configuration2.io.FileHandler;
 
 /**
- * An extension of {@link org.apache.commons.configuration2.PropertiesConfiguration} providing
+ * An extension of {@link PropertiesConfiguration} providing
  * setters for primitive types, a simpler {@linkplain #save(CharSequence) way to save preferences}
- * and transparent handling of {@link java.lang.Enum} lowercased keys.
+ * and transparent handling of {@link Enum} lowercased keys.
  *
  * 
    
- * All accessors defined in {@link org.apache.commons.configuration2.PropertiesConfiguration} have a
- * polymorphic counterpart taking an {@link java.lang.Enum} instead of a string:
- * {@link java.lang.Enum#name()} and {@link java.lang.String#toLowerCase()} are
+ * All accessors defined in {@link PropertiesConfiguration} have a
+ * polymorphic counterpart taking an {@link Enum} instead of a string:
+ * {@link Enum#name()} and {@link String#toLowerCase()} are
  * applied before delegating to the corresponding string-based method. (This apparently wierd choice
- * is due to the need to accommodate the upper-case standard for {@link java.lang.Enum} elements and
+ * is due to the need to accommodate the upper-case standard for {@link Enum} elements and
  * the lower-case standard for property keys.)
  *
  * 
    
diff --git a/src/it/unimi/dsi/util/SemiExternalGammaList.java b/src/main/java/it/unimi/dsi/util/SemiExternalGammaList.java
similarity index 100%
rename from src/it/unimi/dsi/util/SemiExternalGammaList.java
rename to src/main/java/it/unimi/dsi/util/SemiExternalGammaList.java
diff --git a/src/it/unimi/dsi/util/ShiftAddXorSignedStringMap.java b/src/main/java/it/unimi/dsi/util/ShiftAddXorSignedStringMap.java
similarity index 100%
rename from src/it/unimi/dsi/util/ShiftAddXorSignedStringMap.java
rename to src/main/java/it/unimi/dsi/util/ShiftAddXorSignedStringMap.java
diff --git a/src/it/unimi/dsi/util/SplitMix64Random.java b/src/main/java/it/unimi/dsi/util/SplitMix64Random.java
similarity index 100%
rename from src/it/unimi/dsi/util/SplitMix64Random.java
rename to src/main/java/it/unimi/dsi/util/SplitMix64Random.java
diff --git a/src/it/unimi/dsi/util/SplitMix64RandomGenerator.java b/src/main/java/it/unimi/dsi/util/SplitMix64RandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/SplitMix64RandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/SplitMix64RandomGenerator.java
diff --git a/src/it/unimi/dsi/util/StringMap.java b/src/main/java/it/unimi/dsi/util/StringMap.java
similarity index 100%
rename from src/it/unimi/dsi/util/StringMap.java
rename to src/main/java/it/unimi/dsi/util/StringMap.java
diff --git a/src/it/unimi/dsi/util/StringMaps.java b/src/main/java/it/unimi/dsi/util/StringMaps.java
similarity index 100%
rename from src/it/unimi/dsi/util/StringMaps.java
rename to src/main/java/it/unimi/dsi/util/StringMaps.java
diff --git a/src/it/unimi/dsi/util/TernaryIntervalSearchTree.java b/src/main/java/it/unimi/dsi/util/TernaryIntervalSearchTree.java
similarity index 100%
rename from src/it/unimi/dsi/util/TernaryIntervalSearchTree.java
rename to src/main/java/it/unimi/dsi/util/TernaryIntervalSearchTree.java
diff --git a/src/it/unimi/dsi/util/TextPattern.java b/src/main/java/it/unimi/dsi/util/TextPattern.java
similarity index 99%
rename from src/it/unimi/dsi/util/TextPattern.java
rename to src/main/java/it/unimi/dsi/util/TextPattern.java
index a78a630..bf6c7ac 100644
--- a/src/it/unimi/dsi/util/TextPattern.java
+++ b/src/main/java/it/unimi/dsi/util/TextPattern.java
@@ -918,7 +918,7 @@ public final boolean equals(final Object o) {
 	 * String with the same content (suitably lower cased, if the pattern is case insensitive).
 	 *
 	 * @return  a hash code array for this object.
-	 * @see java.lang.String#hashCode()
+	 * @see String#hashCode()
 	 */
 	@Override
 	public final int hashCode() {
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandom.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandom.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandom.java
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128PlusRandom.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128PlusRandom.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusRandom.java
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128PlusRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128PlusRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128StarStarRandom.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128StarStarRandom.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandom.java
diff --git a/src/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256PlusPlusRandom.java b/src/main/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256PlusPlusRandom.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandom.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256PlusRandom.java b/src/main/java/it/unimi/dsi/util/XoShiRo256PlusRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256PlusRandom.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256PlusRandom.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256PlusRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoShiRo256PlusRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256PlusRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256PlusRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256StarStarRandom.java b/src/main/java/it/unimi/dsi/util/XoShiRo256StarStarRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256StarStarRandom.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256StarStarRandom.java
diff --git a/src/it/unimi/dsi/util/XoShiRo256StarStarRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XoShiRo256StarStarRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XoShiRo256StarStarRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XoShiRo256StarStarRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XorGensRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XorGensRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorGensRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XorGensRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XorShift1024StarPhiRandom.java b/src/main/java/it/unimi/dsi/util/XorShift1024StarPhiRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift1024StarPhiRandom.java
rename to src/main/java/it/unimi/dsi/util/XorShift1024StarPhiRandom.java
diff --git a/src/it/unimi/dsi/util/XorShift1024StarPhiRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XorShift1024StarPhiRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift1024StarPhiRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XorShift1024StarPhiRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XorShift1024StarRandom.java b/src/main/java/it/unimi/dsi/util/XorShift1024StarRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift1024StarRandom.java
rename to src/main/java/it/unimi/dsi/util/XorShift1024StarRandom.java
diff --git a/src/it/unimi/dsi/util/XorShift1024StarRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XorShift1024StarRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift1024StarRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XorShift1024StarRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XorShift128PlusRandom.java b/src/main/java/it/unimi/dsi/util/XorShift128PlusRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift128PlusRandom.java
rename to src/main/java/it/unimi/dsi/util/XorShift128PlusRandom.java
diff --git a/src/it/unimi/dsi/util/XorShift128PlusRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XorShift128PlusRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift128PlusRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XorShift128PlusRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/XorShift64StarRandom.java b/src/main/java/it/unimi/dsi/util/XorShift64StarRandom.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift64StarRandom.java
rename to src/main/java/it/unimi/dsi/util/XorShift64StarRandom.java
diff --git a/src/it/unimi/dsi/util/XorShift64StarRandomGenerator.java b/src/main/java/it/unimi/dsi/util/XorShift64StarRandomGenerator.java
similarity index 100%
rename from src/it/unimi/dsi/util/XorShift64StarRandomGenerator.java
rename to src/main/java/it/unimi/dsi/util/XorShift64StarRandomGenerator.java
diff --git a/src/it/unimi/dsi/util/concurrent/ReorderingBlockingQueue.java b/src/main/java/it/unimi/dsi/util/concurrent/ReorderingBlockingQueue.java
similarity index 100%
rename from src/it/unimi/dsi/util/concurrent/ReorderingBlockingQueue.java
rename to src/main/java/it/unimi/dsi/util/concurrent/ReorderingBlockingQueue.java
diff --git a/src/it/unimi/dsi/util/concurrent/package-info.java b/src/main/java/it/unimi/dsi/util/concurrent/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/util/concurrent/package-info.java
rename to src/main/java/it/unimi/dsi/util/concurrent/package-info.java
diff --git a/src/it/unimi/dsi/util/package-info.java b/src/main/java/it/unimi/dsi/util/package-info.java
similarity index 100%
rename from src/it/unimi/dsi/util/package-info.java
rename to src/main/java/it/unimi/dsi/util/package-info.java
diff --git a/src/overview.html b/src/main/javadoc/overview.html
similarity index 100%
rename from src/overview.html
rename to src/main/javadoc/overview.html
diff --git a/src/stylesheet.css b/src/main/javadoc/stylesheet.css
similarity index 100%
rename from src/stylesheet.css
rename to src/main/javadoc/stylesheet.css
diff --git a/src/it/unimi/dsi/io/delta.in.16 b/src/main/resources/it/unimi/dsi/io/delta.in.16
similarity index 100%
rename from src/it/unimi/dsi/io/delta.in.16
rename to src/main/resources/it/unimi/dsi/io/delta.in.16
diff --git a/src/it/unimi/dsi/io/delta.out.12 b/src/main/resources/it/unimi/dsi/io/delta.out.12
similarity index 100%
rename from src/it/unimi/dsi/io/delta.out.12
rename to src/main/resources/it/unimi/dsi/io/delta.out.12
diff --git a/src/it/unimi/dsi/io/gamma.in.16 b/src/main/resources/it/unimi/dsi/io/gamma.in.16
similarity index 100%
rename from src/it/unimi/dsi/io/gamma.in.16
rename to src/main/resources/it/unimi/dsi/io/gamma.in.16
diff --git a/src/it/unimi/dsi/io/gamma.out.12 b/src/main/resources/it/unimi/dsi/io/gamma.out.12
similarity index 100%
rename from src/it/unimi/dsi/io/gamma.out.12
rename to src/main/resources/it/unimi/dsi/io/gamma.out.12
diff --git a/src/it/unimi/dsi/io/shiftedgamma.in.16 b/src/main/resources/it/unimi/dsi/io/shiftedgamma.in.16
similarity index 100%
rename from src/it/unimi/dsi/io/shiftedgamma.in.16
rename to src/main/resources/it/unimi/dsi/io/shiftedgamma.in.16
diff --git a/src/it/unimi/dsi/io/shiftedgamma.out.12 b/src/main/resources/it/unimi/dsi/io/shiftedgamma.out.12
similarity index 100%
rename from src/it/unimi/dsi/io/shiftedgamma.out.12
rename to src/main/resources/it/unimi/dsi/io/shiftedgamma.out.12
diff --git a/src/it/unimi/dsi/io/zeta3.in.16 b/src/main/resources/it/unimi/dsi/io/zeta3.in.16
similarity index 100%
rename from src/it/unimi/dsi/io/zeta3.in.16
rename to src/main/resources/it/unimi/dsi/io/zeta3.in.16
diff --git a/src/it/unimi/dsi/io/zeta3.out.12 b/src/main/resources/it/unimi/dsi/io/zeta3.out.12
similarity index 100%
rename from src/it/unimi/dsi/io/zeta3.out.12
rename to src/main/resources/it/unimi/dsi/io/zeta3.out.12
diff --git a/test/it/unimi/dsi/UtilTest.java b/src/test/java/it/unimi/dsi/UtilTest.java
similarity index 100%
rename from test/it/unimi/dsi/UtilTest.java
rename to src/test/java/it/unimi/dsi/UtilTest.java
diff --git a/slow/it/unimi/dsi/big/util/FrontCodedStringBigListSlowTest.java b/src/test/java/it/unimi/dsi/big/util/FrontCodedStringBigListSlowTest.java
similarity index 100%
rename from slow/it/unimi/dsi/big/util/FrontCodedStringBigListSlowTest.java
rename to src/test/java/it/unimi/dsi/big/util/FrontCodedStringBigListSlowTest.java
diff --git a/test/it/unimi/dsi/big/util/FrontCodedStringBigListTest.java b/src/test/java/it/unimi/dsi/big/util/FrontCodedStringBigListTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/FrontCodedStringBigListTest.java
rename to src/test/java/it/unimi/dsi/big/util/FrontCodedStringBigListTest.java
diff --git a/test/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java b/src/test/java/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java
rename to src/test/java/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java
diff --git a/slow/it/unimi/dsi/big/util/ImmutableExternalPrefixMapSlowTest.java b/src/test/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMapSlowTest.java
similarity index 100%
rename from slow/it/unimi/dsi/big/util/ImmutableExternalPrefixMapSlowTest.java
rename to src/test/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMapSlowTest.java
diff --git a/test/it/unimi/dsi/big/util/ImmutableExternalPrefixMapTest.java b/src/test/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/ImmutableExternalPrefixMapTest.java
rename to src/test/java/it/unimi/dsi/big/util/ImmutableExternalPrefixMapTest.java
diff --git a/slow/it/unimi/dsi/big/util/LiterallySignedStringMapSlowTest.java b/src/test/java/it/unimi/dsi/big/util/LiterallySignedStringMapSlowTest.java
similarity index 100%
rename from slow/it/unimi/dsi/big/util/LiterallySignedStringMapSlowTest.java
rename to src/test/java/it/unimi/dsi/big/util/LiterallySignedStringMapSlowTest.java
diff --git a/test/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java b/src/test/java/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java
rename to src/test/java/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java
diff --git a/test/it/unimi/dsi/big/util/LongBigArraySignedStringMapTest.java b/src/test/java/it/unimi/dsi/big/util/LongBigArraySignedStringMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/LongBigArraySignedStringMapTest.java
rename to src/test/java/it/unimi/dsi/big/util/LongBigArraySignedStringMapTest.java
diff --git a/test/it/unimi/dsi/big/util/MappedFrontCodedStringBigListTest.java b/src/test/java/it/unimi/dsi/big/util/MappedFrontCodedStringBigListTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/MappedFrontCodedStringBigListTest.java
rename to src/test/java/it/unimi/dsi/big/util/MappedFrontCodedStringBigListTest.java
diff --git a/test/it/unimi/dsi/big/util/SemiExternalGammaBigListTest.java b/src/test/java/it/unimi/dsi/big/util/SemiExternalGammaBigListTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/SemiExternalGammaBigListTest.java
rename to src/test/java/it/unimi/dsi/big/util/SemiExternalGammaBigListTest.java
diff --git a/slow/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapSlowTest.java b/src/test/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapSlowTest.java
similarity index 100%
rename from slow/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapSlowTest.java
rename to src/test/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapSlowTest.java
diff --git a/test/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java b/src/test/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java
rename to src/test/java/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java
diff --git a/test/it/unimi/dsi/big/util/TernaryIntervalSearchTreeTest.java b/src/test/java/it/unimi/dsi/big/util/TernaryIntervalSearchTreeTest.java
similarity index 100%
rename from test/it/unimi/dsi/big/util/TernaryIntervalSearchTreeTest.java
rename to src/test/java/it/unimi/dsi/big/util/TernaryIntervalSearchTreeTest.java
diff --git a/test/it/unimi/dsi/bits/AbstractBitVectorTest.java b/src/test/java/it/unimi/dsi/bits/AbstractBitVectorTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/AbstractBitVectorTest.java
rename to src/test/java/it/unimi/dsi/bits/AbstractBitVectorTest.java
diff --git a/test/it/unimi/dsi/bits/BitVectorTestCase.java b/src/test/java/it/unimi/dsi/bits/BitVectorTestCase.java
similarity index 100%
rename from test/it/unimi/dsi/bits/BitVectorTestCase.java
rename to src/test/java/it/unimi/dsi/bits/BitVectorTestCase.java
diff --git a/test/it/unimi/dsi/bits/BitVectorsTest.java b/src/test/java/it/unimi/dsi/bits/BitVectorsTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/BitVectorsTest.java
rename to src/test/java/it/unimi/dsi/bits/BitVectorsTest.java
diff --git a/test/it/unimi/dsi/bits/BooleanListBitVectorTest.java b/src/test/java/it/unimi/dsi/bits/BooleanListBitVectorTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/BooleanListBitVectorTest.java
rename to src/test/java/it/unimi/dsi/bits/BooleanListBitVectorTest.java
diff --git a/test/it/unimi/dsi/bits/ByteArrayTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/ByteArrayTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/ByteArrayTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/ByteArrayTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/FastTest.java b/src/test/java/it/unimi/dsi/bits/FastTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/FastTest.java
rename to src/test/java/it/unimi/dsi/bits/FastTest.java
diff --git a/test/it/unimi/dsi/bits/FixedLongTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/FixedLongTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/FixedLongTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/FixedLongTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/IsoTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/IsoTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/IsoTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/IsoTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/LongArrayBitVectorTest.java b/src/test/java/it/unimi/dsi/bits/LongArrayBitVectorTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/LongArrayBitVectorTest.java
rename to src/test/java/it/unimi/dsi/bits/LongArrayBitVectorTest.java
diff --git a/test/it/unimi/dsi/bits/LongBigArrayBitVectorTest.java b/src/test/java/it/unimi/dsi/bits/LongBigArrayBitVectorTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/LongBigArrayBitVectorTest.java
rename to src/test/java/it/unimi/dsi/bits/LongBigArrayBitVectorTest.java
diff --git a/test/it/unimi/dsi/bits/PrefixFreeTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/PrefixFreeTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/PrefixFreeTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/PrefixFreeTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/RawByteArrayTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/RawByteArrayTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/RawByteArrayTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/RawByteArrayTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/RawFixedLongTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/RawFixedLongTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/RawFixedLongTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/RawFixedLongTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/RawISOTransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/RawISOTransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/RawISOTransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/RawISOTransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/RawUtf16TransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/RawUtf16TransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/RawUtf16TransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/RawUtf16TransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/RawUtf32TransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/RawUtf32TransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/RawUtf32TransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/RawUtf32TransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/Utf16TransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/Utf16TransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/Utf16TransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/Utf16TransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/bits/Utf32TransformationStrategyTest.java b/src/test/java/it/unimi/dsi/bits/Utf32TransformationStrategyTest.java
similarity index 100%
rename from test/it/unimi/dsi/bits/Utf32TransformationStrategyTest.java
rename to src/test/java/it/unimi/dsi/bits/Utf32TransformationStrategyTest.java
diff --git a/test/it/unimi/dsi/compression/CodecTestCase.java b/src/test/java/it/unimi/dsi/compression/CodecTestCase.java
similarity index 100%
rename from test/it/unimi/dsi/compression/CodecTestCase.java
rename to src/test/java/it/unimi/dsi/compression/CodecTestCase.java
diff --git a/test/it/unimi/dsi/compression/HuTuckerCodecTest.java b/src/test/java/it/unimi/dsi/compression/HuTuckerCodecTest.java
similarity index 100%
rename from test/it/unimi/dsi/compression/HuTuckerCodecTest.java
rename to src/test/java/it/unimi/dsi/compression/HuTuckerCodecTest.java
diff --git a/test/it/unimi/dsi/compression/HuffmanCodecTest.java b/src/test/java/it/unimi/dsi/compression/HuffmanCodecTest.java
similarity index 100%
rename from test/it/unimi/dsi/compression/HuffmanCodecTest.java
rename to src/test/java/it/unimi/dsi/compression/HuffmanCodecTest.java
diff --git a/test/it/unimi/dsi/io/ByteBufferInputStreamTest.java b/src/test/java/it/unimi/dsi/io/ByteBufferInputStreamTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/ByteBufferInputStreamTest.java
rename to src/test/java/it/unimi/dsi/io/ByteBufferInputStreamTest.java
diff --git a/test/it/unimi/dsi/io/ByteDiskQueueTest.java b/src/test/java/it/unimi/dsi/io/ByteDiskQueueTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/ByteDiskQueueTest.java
rename to src/test/java/it/unimi/dsi/io/ByteDiskQueueTest.java
diff --git a/test/it/unimi/dsi/io/DelimitedWordReaderTest.java b/src/test/java/it/unimi/dsi/io/DelimitedWordReaderTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/DelimitedWordReaderTest.java
rename to src/test/java/it/unimi/dsi/io/DelimitedWordReaderTest.java
diff --git a/test/it/unimi/dsi/io/FastBufferedReaderTest.java b/src/test/java/it/unimi/dsi/io/FastBufferedReaderTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/FastBufferedReaderTest.java
rename to src/test/java/it/unimi/dsi/io/FastBufferedReaderTest.java
diff --git a/test/it/unimi/dsi/io/FileLinesByteArrayCollectionTest.java b/src/test/java/it/unimi/dsi/io/FileLinesByteArrayCollectionTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/FileLinesByteArrayCollectionTest.java
rename to src/test/java/it/unimi/dsi/io/FileLinesByteArrayCollectionTest.java
diff --git a/test/it/unimi/dsi/io/FileLinesMutableStringIterableTest.java b/src/test/java/it/unimi/dsi/io/FileLinesMutableStringIterableTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/FileLinesMutableStringIterableTest.java
rename to src/test/java/it/unimi/dsi/io/FileLinesMutableStringIterableTest.java
diff --git a/test/it/unimi/dsi/io/InputBitStreamTest.java b/src/test/java/it/unimi/dsi/io/InputBitStreamTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/InputBitStreamTest.java
rename to src/test/java/it/unimi/dsi/io/InputBitStreamTest.java
diff --git a/test/it/unimi/dsi/io/OfflineIterableTest.java b/src/test/java/it/unimi/dsi/io/OfflineIterableTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/OfflineIterableTest.java
rename to src/test/java/it/unimi/dsi/io/OfflineIterableTest.java
diff --git a/test/it/unimi/dsi/io/OutputBitStreamTest.java b/src/test/java/it/unimi/dsi/io/OutputBitStreamTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/OutputBitStreamTest.java
rename to src/test/java/it/unimi/dsi/io/OutputBitStreamTest.java
diff --git a/test/it/unimi/dsi/io/SegmentedInputStreamTest.java b/src/test/java/it/unimi/dsi/io/SegmentedInputStreamTest.java
similarity index 100%
rename from test/it/unimi/dsi/io/SegmentedInputStreamTest.java
rename to src/test/java/it/unimi/dsi/io/SegmentedInputStreamTest.java
diff --git a/test/it/unimi/dsi/lang/EnumParserTest.java b/src/test/java/it/unimi/dsi/lang/EnumParserTest.java
similarity index 100%
rename from test/it/unimi/dsi/lang/EnumParserTest.java
rename to src/test/java/it/unimi/dsi/lang/EnumParserTest.java
diff --git a/test/it/unimi/dsi/lang/MutableStringTest.java b/src/test/java/it/unimi/dsi/lang/MutableStringTest.java
similarity index 100%
rename from test/it/unimi/dsi/lang/MutableStringTest.java
rename to src/test/java/it/unimi/dsi/lang/MutableStringTest.java
diff --git a/test/it/unimi/dsi/lang/ObjectParserTest.java b/src/test/java/it/unimi/dsi/lang/ObjectParserTest.java
similarity index 100%
rename from test/it/unimi/dsi/lang/ObjectParserTest.java
rename to src/test/java/it/unimi/dsi/lang/ObjectParserTest.java
diff --git a/test/it/unimi/dsi/lang/TwoStrings.java b/src/test/java/it/unimi/dsi/lang/TwoStrings.java
similarity index 100%
rename from test/it/unimi/dsi/lang/TwoStrings.java
rename to src/test/java/it/unimi/dsi/lang/TwoStrings.java
diff --git a/test/it/unimi/dsi/parser/BulletParserTest.java b/src/test/java/it/unimi/dsi/parser/BulletParserTest.java
similarity index 100%
rename from test/it/unimi/dsi/parser/BulletParserTest.java
rename to src/test/java/it/unimi/dsi/parser/BulletParserTest.java
diff --git a/test/it/unimi/dsi/parser/callback/BulletParserCallbackContentHandler.java b/src/test/java/it/unimi/dsi/parser/callback/BulletParserCallbackContentHandler.java
similarity index 100%
rename from test/it/unimi/dsi/parser/callback/BulletParserCallbackContentHandler.java
rename to src/test/java/it/unimi/dsi/parser/callback/BulletParserCallbackContentHandler.java
diff --git a/test/it/unimi/dsi/parser/callback/LinkExtractorTest.data b/src/test/java/it/unimi/dsi/parser/callback/LinkExtractorTest.data
similarity index 100%
rename from test/it/unimi/dsi/parser/callback/LinkExtractorTest.data
rename to src/test/java/it/unimi/dsi/parser/callback/LinkExtractorTest.data
diff --git a/test/it/unimi/dsi/parser/callback/LinkExtractorTest.java b/src/test/java/it/unimi/dsi/parser/callback/LinkExtractorTest.java
similarity index 100%
rename from test/it/unimi/dsi/parser/callback/LinkExtractorTest.java
rename to src/test/java/it/unimi/dsi/parser/callback/LinkExtractorTest.java
diff --git a/test/it/unimi/dsi/parser/callback/TextExtractorTest.java b/src/test/java/it/unimi/dsi/parser/callback/TextExtractorTest.java
similarity index 100%
rename from test/it/unimi/dsi/parser/callback/TextExtractorTest.java
rename to src/test/java/it/unimi/dsi/parser/callback/TextExtractorTest.java
diff --git a/test/it/unimi/dsi/parser/test.data b/src/test/java/it/unimi/dsi/parser/test.data
similarity index 100%
rename from test/it/unimi/dsi/parser/test.data
rename to src/test/java/it/unimi/dsi/parser/test.data
diff --git a/test/it/unimi/dsi/stat/JackknifeTest.java b/src/test/java/it/unimi/dsi/stat/JackknifeTest.java
similarity index 100%
rename from test/it/unimi/dsi/stat/JackknifeTest.java
rename to src/test/java/it/unimi/dsi/stat/JackknifeTest.java
diff --git a/test/it/unimi/dsi/stat/SummaryStatsTest.java b/src/test/java/it/unimi/dsi/stat/SummaryStatsTest.java
similarity index 100%
rename from test/it/unimi/dsi/stat/SummaryStatsTest.java
rename to src/test/java/it/unimi/dsi/stat/SummaryStatsTest.java
diff --git a/test/it/unimi/dsi/test/XorShiftTest.java b/src/test/java/it/unimi/dsi/test/XorShiftTest.java
similarity index 100%
rename from test/it/unimi/dsi/test/XorShiftTest.java
rename to src/test/java/it/unimi/dsi/test/XorShiftTest.java
diff --git a/test/it/unimi/dsi/util/BloomFilterTest.java b/src/test/java/it/unimi/dsi/util/BloomFilterTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/BloomFilterTest.java
rename to src/test/java/it/unimi/dsi/util/BloomFilterTest.java
diff --git a/test/it/unimi/dsi/util/ByteBufferLongBigListTest.java b/src/test/java/it/unimi/dsi/util/ByteBufferLongBigListTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/ByteBufferLongBigListTest.java
rename to src/test/java/it/unimi/dsi/util/ByteBufferLongBigListTest.java
diff --git a/test/it/unimi/dsi/util/CircularCharArrayBufferTest.java b/src/test/java/it/unimi/dsi/util/CircularCharArrayBufferTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/CircularCharArrayBufferTest.java
rename to src/test/java/it/unimi/dsi/util/CircularCharArrayBufferTest.java
diff --git a/test/it/unimi/dsi/util/FrontCodedStringListTest.java b/src/test/java/it/unimi/dsi/util/FrontCodedStringListTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/FrontCodedStringListTest.java
rename to src/test/java/it/unimi/dsi/util/FrontCodedStringListTest.java
diff --git a/slow/it/unimi/dsi/util/HyperLogLogCounterArraySlowTest.java b/src/test/java/it/unimi/dsi/util/HyperLogLogCounterArraySlowTest.java
similarity index 100%
rename from slow/it/unimi/dsi/util/HyperLogLogCounterArraySlowTest.java
rename to src/test/java/it/unimi/dsi/util/HyperLogLogCounterArraySlowTest.java
diff --git a/test/it/unimi/dsi/util/HyperLogLogCounterArrayTest.java b/src/test/java/it/unimi/dsi/util/HyperLogLogCounterArrayTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/HyperLogLogCounterArrayTest.java
rename to src/test/java/it/unimi/dsi/util/HyperLogLogCounterArrayTest.java
diff --git a/test/it/unimi/dsi/util/ImmutableBinaryTrieTest.java b/src/test/java/it/unimi/dsi/util/ImmutableBinaryTrieTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/ImmutableBinaryTrieTest.java
rename to src/test/java/it/unimi/dsi/util/ImmutableBinaryTrieTest.java
diff --git a/test/it/unimi/dsi/util/ImmutableExternalPrefixMapTest.java b/src/test/java/it/unimi/dsi/util/ImmutableExternalPrefixMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/ImmutableExternalPrefixMapTest.java
rename to src/test/java/it/unimi/dsi/util/ImmutableExternalPrefixMapTest.java
diff --git a/test/it/unimi/dsi/util/IntervalTest.java b/src/test/java/it/unimi/dsi/util/IntervalTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/IntervalTest.java
rename to src/test/java/it/unimi/dsi/util/IntervalTest.java
diff --git a/test/it/unimi/dsi/util/KahanSummationTest.java b/src/test/java/it/unimi/dsi/util/KahanSummationTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/KahanSummationTest.java
rename to src/test/java/it/unimi/dsi/util/KahanSummationTest.java
diff --git a/test/it/unimi/dsi/util/LineIteratorTest.java b/src/test/java/it/unimi/dsi/util/LineIteratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/LineIteratorTest.java
rename to src/test/java/it/unimi/dsi/util/LineIteratorTest.java
diff --git a/test/it/unimi/dsi/util/LiterallySignedStringMapTest.java b/src/test/java/it/unimi/dsi/util/LiterallySignedStringMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/LiterallySignedStringMapTest.java
rename to src/test/java/it/unimi/dsi/util/LiterallySignedStringMapTest.java
diff --git a/test/it/unimi/dsi/util/LongIntervalTest.java b/src/test/java/it/unimi/dsi/util/LongIntervalTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/LongIntervalTest.java
rename to src/test/java/it/unimi/dsi/util/LongIntervalTest.java
diff --git a/test/it/unimi/dsi/util/SemiExternalGammaListTest.java b/src/test/java/it/unimi/dsi/util/SemiExternalGammaListTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/SemiExternalGammaListTest.java
rename to src/test/java/it/unimi/dsi/util/SemiExternalGammaListTest.java
diff --git a/test/it/unimi/dsi/util/ShiftAddXorSignedStringMapTest.java b/src/test/java/it/unimi/dsi/util/ShiftAddXorSignedStringMapTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/ShiftAddXorSignedStringMapTest.java
rename to src/test/java/it/unimi/dsi/util/ShiftAddXorSignedStringMapTest.java
diff --git a/test/it/unimi/dsi/util/SplitMix64RandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/SplitMix64RandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/SplitMix64RandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/SplitMix64RandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/SplitMix64RandomTest.java b/src/test/java/it/unimi/dsi/util/SplitMix64RandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/SplitMix64RandomTest.java
rename to src/test/java/it/unimi/dsi/util/SplitMix64RandomTest.java
diff --git a/test/it/unimi/dsi/util/TernaryIntervalSearchTreeTest.java b/src/test/java/it/unimi/dsi/util/TernaryIntervalSearchTreeTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/TernaryIntervalSearchTreeTest.java
rename to src/test/java/it/unimi/dsi/util/TernaryIntervalSearchTreeTest.java
diff --git a/test/it/unimi/dsi/util/TextPatternTest.java b/src/test/java/it/unimi/dsi/util/TextPatternTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/TextPatternTest.java
rename to src/test/java/it/unimi/dsi/util/TextPatternTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusPlusRandomTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128PlusRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128PlusRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128PlusRandomTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128PlusRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128PlusRandomTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoRoShiRo128StarStarRandomTest.java b/src/test/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoRoShiRo128StarStarRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoRoShiRo128StarStarRandomTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256PlusPlusRandomTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256PlusPlusRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256PlusPlusRandomTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256PlusRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256PlusRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256PlusRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256PlusRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256PlusRandomTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256PlusRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256PlusRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256PlusRandomTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256StarStarRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256StarStarRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256StarStarRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256StarStarRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XoShiRo256StarStarRandomTest.java b/src/test/java/it/unimi/dsi/util/XoShiRo256StarStarRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XoShiRo256StarStarRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XoShiRo256StarStarRandomTest.java
diff --git a/test/it/unimi/dsi/util/XorShift1024StarPhiRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XorShift1024StarPhiRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift1024StarPhiRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift1024StarPhiRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XorShift1024StarPhiRandomTest.java b/src/test/java/it/unimi/dsi/util/XorShift1024StarPhiRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift1024StarPhiRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift1024StarPhiRandomTest.java
diff --git a/test/it/unimi/dsi/util/XorShift1024StarRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XorShift1024StarRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift1024StarRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift1024StarRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XorShift1024StarRandomTest.java b/src/test/java/it/unimi/dsi/util/XorShift1024StarRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift1024StarRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift1024StarRandomTest.java
diff --git a/test/it/unimi/dsi/util/XorShift128PlusRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XorShift128PlusRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift128PlusRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift128PlusRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XorShift128PlusRandomTest.java b/src/test/java/it/unimi/dsi/util/XorShift128PlusRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift128PlusRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift128PlusRandomTest.java
diff --git a/test/it/unimi/dsi/util/XorShift64StarRandomGeneratorTest.java b/src/test/java/it/unimi/dsi/util/XorShift64StarRandomGeneratorTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift64StarRandomGeneratorTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift64StarRandomGeneratorTest.java
diff --git a/test/it/unimi/dsi/util/XorShift64StarRandomTest.java b/src/test/java/it/unimi/dsi/util/XorShift64StarRandomTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/XorShift64StarRandomTest.java
rename to src/test/java/it/unimi/dsi/util/XorShift64StarRandomTest.java
diff --git a/test/it/unimi/dsi/util/concurrent/ReorderingBlockingQueueTest.java b/src/test/java/it/unimi/dsi/util/concurrent/ReorderingBlockingQueueTest.java
similarity index 100%
rename from test/it/unimi/dsi/util/concurrent/ReorderingBlockingQueueTest.java
rename to src/test/java/it/unimi/dsi/util/concurrent/ReorderingBlockingQueueTest.java