diff --git a/pom.xml b/pom.xml
index 6b9ce19..5842e02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>mkopec.summ</groupId>
+	<groupId>pl.waw.ipipan.zil.summ</groupId>
 	<artifactId>pscapi</artifactId>
-	<version>0.1-SNAPSHOT</version>
+	<version>1.0-SNAPSHOT</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,14 +20,14 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
+			<version>4.12</version>
 		</dependency>
 	</dependencies>
 
@@ -44,4 +44,15 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<distributionManagement>
+		<repository>
+			<id>deployment</id>
+			<url>http://maven.nlp.ipipan.waw.pl/content/repositories/releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>deployment</id>
+			<url>http://maven.nlp.ipipan.waw.pl/content/repositories/snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>
\ No newline at end of file
diff --git a/src/main/java/mkopec/summ/pscapi/io/PSC_IO.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/io/PSC_IO.java
index 9f4b4c9..562e920 100644
--- a/src/main/java/mkopec/summ/pscapi/io/PSC_IO.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/io/PSC_IO.java
@@ -1,4 +1,4 @@
-package mkopec.summ.pscapi.io;
+package pl.waw.ipipan.zil.summ.pscapi.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,13 +8,14 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import mkopec.summ.pscapi.xml.Text;
+import pl.waw.ipipan.zil.summ.pscapi.xml.Text;
 
 public class PSC_IO {
 
-	private final static Logger LOG = Logger.getLogger(PSC_IO.class);
+	private final static Logger LOG = LogManager.getLogger(PSC_IO.class);
 
 	public static Text readText(String testFilePath) throws IOException, JAXBException {
 		return readText(new File(testFilePath));
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Adapter1.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter1.java
index b841ae8..6baec88 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Adapter1.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter1.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Adapter2.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter2.java
index 648bde9..c8a5abb 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Adapter2.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter2.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
diff --git a/src/main/java/mkopec/summ/pscapi/xml/ObjectFactory.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/ObjectFactory.java
index 46ca11b..5cada92 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/ObjectFactory.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/ObjectFactory.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Span.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Span.java
index ee4667f..60861b3 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Span.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Span.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/mkopec/summ/pscapi/xml/SpanType.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/SpanType.java
index f01e1b6..6868d13 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/SpanType.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/SpanType.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Spans.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Spans.java
index 1ad8ba8..fbe83c3 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Spans.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Spans.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Summaries.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summaries.java
index 4a80fc8..a2b192d 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Summaries.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summaries.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Summary.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summary.java
index 1e30669..b7c45e4 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Summary.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summary.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/mkopec/summ/pscapi/xml/Text.java b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Text.java
index e5612c7..6a28f23 100644
--- a/src/main/java/mkopec/summ/pscapi/xml/Text.java
+++ b/src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Text.java
@@ -6,7 +6,7 @@
 //
 
 
-package mkopec.summ.pscapi.xml;
+package pl.waw.ipipan.zil.summ.pscapi.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index d726a06..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootCategory=DEBUG, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=DEBUG
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%-5p] %d{HH:mm:ss} %C{1}: %m%n
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..e43e1b9
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Root level="error">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/src/test/java/mkopec/summ/pscapi/io/ReadTest.java b/src/test/java/pl/waw/ipipan/zil/summ/pscapi/io/ReadTest.java
index 18a1922..96b702c 100644
--- a/src/test/java/mkopec/summ/pscapi/io/ReadTest.java
+++ b/src/test/java/pl/waw/ipipan/zil/summ/pscapi/io/ReadTest.java
@@ -1,4 +1,4 @@
-package mkopec.summ.pscapi.io;
+package pl.waw.ipipan.zil.summ.pscapi.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,6 +9,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import pl.waw.ipipan.zil.summ.pscapi.io.PSC_IO;
+
 public class ReadTest {
 
 	@Rule