diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..0b0766f
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..09e3bc9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/.project b/.project
new file mode 100644
index 0000000..16957d7
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>java-nio-server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..943e578
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..e3b3192
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,29 @@
+<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>informatik-ag-ngl</groupId>
+	<artifactId>java-nio-server</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.6.0-M1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<release>8</release>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/jenkov/nioserver/SocketAccepter.java b/src/main/java/com/jenkov/nioserver/SocketAcceptor.java
similarity index 100%
rename from src/main/java/com/jenkov/nioserver/SocketAccepter.java
rename to src/main/java/com/jenkov/nioserver/SocketAcceptor.java
diff --git a/src/test/java/com.jenkov.nioserver/MessageBufferTest.java b/src/test/java/com/jenkov/nioserver/MessageBufferTest.java
similarity index 100%
rename from src/test/java/com.jenkov.nioserver/MessageBufferTest.java
rename to src/test/java/com/jenkov/nioserver/MessageBufferTest.java
diff --git a/src/test/java/com.jenkov.nioserver/MessageTest.java b/src/test/java/com/jenkov/nioserver/MessageTest.java
similarity index 100%
rename from src/test/java/com.jenkov.nioserver/MessageTest.java
rename to src/test/java/com/jenkov/nioserver/MessageTest.java
diff --git a/src/test/java/com.jenkov.nioserver/SelectorTest.java b/src/test/java/com/jenkov/nioserver/SelectorTest.java
similarity index 100%
rename from src/test/java/com.jenkov.nioserver/SelectorTest.java
rename to src/test/java/com/jenkov/nioserver/SelectorTest.java
diff --git a/src/test/java/com.jenkov.nioserver/http/HttpUtilTest.java b/src/test/java/com/jenkov/nioserver/http/HttpUtilTest.java
similarity index 100%
rename from src/test/java/com.jenkov.nioserver/http/HttpUtilTest.java
rename to src/test/java/com/jenkov/nioserver/http/HttpUtilTest.java