diff --git a/.gitignore b/.gitignore
index f911407f..003ab4c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.iml
 out
 /bin/
+/target/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..220baade
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.mycompany</groupId>
+    <artifactId>java8-tutorial</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/src/com/winterbe/java8/samples/concurrent/Atomic1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Atomic1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Atomic1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Atomic1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/CompletableFuture1.java b/src/main/java/com/winterbe/java8/samples/concurrent/CompletableFuture1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/CompletableFuture1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/CompletableFuture1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/ConcurrentHashMap1.java b/src/main/java/com/winterbe/java8/samples/concurrent/ConcurrentHashMap1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/ConcurrentHashMap1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/ConcurrentHashMap1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/ConcurrentUtils.java b/src/main/java/com/winterbe/java8/samples/concurrent/ConcurrentUtils.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/ConcurrentUtils.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/ConcurrentUtils.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Executors1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Executors1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Executors1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Executors1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Executors2.java b/src/main/java/com/winterbe/java8/samples/concurrent/Executors2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Executors2.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Executors2.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Executors3.java b/src/main/java/com/winterbe/java8/samples/concurrent/Executors3.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Executors3.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Executors3.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock2.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock2.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock2.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock3.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock3.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock3.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock3.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock4.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock4.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock4.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock4.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock5.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock5.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock5.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock5.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Lock6.java b/src/main/java/com/winterbe/java8/samples/concurrent/Lock6.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Lock6.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Lock6.java
diff --git a/src/com/winterbe/java8/samples/concurrent/LongAccumulator1.java b/src/main/java/com/winterbe/java8/samples/concurrent/LongAccumulator1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/LongAccumulator1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/LongAccumulator1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/LongAdder1.java b/src/main/java/com/winterbe/java8/samples/concurrent/LongAdder1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/LongAdder1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/LongAdder1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Semaphore1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Semaphore1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Semaphore1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Semaphore1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Semaphore2.java b/src/main/java/com/winterbe/java8/samples/concurrent/Semaphore2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Semaphore2.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Semaphore2.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Synchronized1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Synchronized1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Synchronized1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Synchronized1.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Synchronized2.java b/src/main/java/com/winterbe/java8/samples/concurrent/Synchronized2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Synchronized2.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Synchronized2.java
diff --git a/src/com/winterbe/java8/samples/concurrent/Threads1.java b/src/main/java/com/winterbe/java8/samples/concurrent/Threads1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/concurrent/Threads1.java
rename to src/main/java/com/winterbe/java8/samples/concurrent/Threads1.java
diff --git a/src/com/winterbe/java8/samples/lambda/Interface1.java b/src/main/java/com/winterbe/java8/samples/lambda/Interface1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Interface1.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Interface1.java
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda1.java b/src/main/java/com/winterbe/java8/samples/lambda/Lambda1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Lambda1.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Lambda1.java
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda2.java b/src/main/java/com/winterbe/java8/samples/lambda/Lambda2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Lambda2.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Lambda2.java
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda3.java b/src/main/java/com/winterbe/java8/samples/lambda/Lambda3.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Lambda3.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Lambda3.java
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda4.java b/src/main/java/com/winterbe/java8/samples/lambda/Lambda4.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Lambda4.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Lambda4.java
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda5.java b/src/main/java/com/winterbe/java8/samples/lambda/Lambda5.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Lambda5.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Lambda5.java
diff --git a/src/com/winterbe/java8/samples/lambda/Person.java b/src/main/java/com/winterbe/java8/samples/lambda/Person.java
similarity index 100%
rename from src/com/winterbe/java8/samples/lambda/Person.java
rename to src/main/java/com/winterbe/java8/samples/lambda/Person.java
diff --git a/src/com/winterbe/java8/samples/misc/Annotations1.java b/src/main/java/com/winterbe/java8/samples/misc/Annotations1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/Annotations1.java
rename to src/main/java/com/winterbe/java8/samples/misc/Annotations1.java
diff --git a/src/com/winterbe/java8/samples/misc/CheckedFunctions.java b/src/main/java/com/winterbe/java8/samples/misc/CheckedFunctions.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/CheckedFunctions.java
rename to src/main/java/com/winterbe/java8/samples/misc/CheckedFunctions.java
diff --git a/src/com/winterbe/java8/samples/misc/Concurrency1.java b/src/main/java/com/winterbe/java8/samples/misc/Concurrency1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/Concurrency1.java
rename to src/main/java/com/winterbe/java8/samples/misc/Concurrency1.java
diff --git a/src/com/winterbe/java8/samples/misc/Files1.java b/src/main/java/com/winterbe/java8/samples/misc/Files1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/Files1.java
rename to src/main/java/com/winterbe/java8/samples/misc/Files1.java
diff --git a/src/com/winterbe/java8/samples/misc/Maps1.java b/src/main/java/com/winterbe/java8/samples/misc/Maps1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/Maps1.java
rename to src/main/java/com/winterbe/java8/samples/misc/Maps1.java
diff --git a/src/com/winterbe/java8/samples/misc/Math1.java b/src/main/java/com/winterbe/java8/samples/misc/Math1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/Math1.java
rename to src/main/java/com/winterbe/java8/samples/misc/Math1.java
diff --git a/src/com/winterbe/java8/samples/misc/String1.java b/src/main/java/com/winterbe/java8/samples/misc/String1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/misc/String1.java
rename to src/main/java/com/winterbe/java8/samples/misc/String1.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn1.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn1.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn1.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn10.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn10.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn10.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn10.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn11.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn11.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn11.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn11.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn2.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn2.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn2.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn3.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn3.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn3.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn3.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn4.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn4.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn4.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn4.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn5.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn5.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn5.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn5.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn6.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn6.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn6.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn6.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn7.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn7.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn7.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn7.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn8.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn8.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn8.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn8.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn9.java b/src/main/java/com/winterbe/java8/samples/nashorn/Nashorn9.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Nashorn9.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Nashorn9.java
diff --git a/src/com/winterbe/java8/samples/nashorn/Product.java b/src/main/java/com/winterbe/java8/samples/nashorn/Product.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/Product.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/Product.java
diff --git a/src/com/winterbe/java8/samples/nashorn/SuperRunner.java b/src/main/java/com/winterbe/java8/samples/nashorn/SuperRunner.java
similarity index 100%
rename from src/com/winterbe/java8/samples/nashorn/SuperRunner.java
rename to src/main/java/com/winterbe/java8/samples/nashorn/SuperRunner.java
diff --git a/src/com/winterbe/java8/samples/stream/Optional1.java b/src/main/java/com/winterbe/java8/samples/stream/Optional1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Optional1.java
rename to src/main/java/com/winterbe/java8/samples/stream/Optional1.java
diff --git a/src/com/winterbe/java8/samples/stream/Optional2.java b/src/main/java/com/winterbe/java8/samples/stream/Optional2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Optional2.java
rename to src/main/java/com/winterbe/java8/samples/stream/Optional2.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams1.java b/src/main/java/com/winterbe/java8/samples/stream/Streams1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams1.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams1.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams10.java b/src/main/java/com/winterbe/java8/samples/stream/Streams10.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams10.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams10.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams11.java b/src/main/java/com/winterbe/java8/samples/stream/Streams11.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams11.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams11.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams12.java b/src/main/java/com/winterbe/java8/samples/stream/Streams12.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams12.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams12.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams13.java b/src/main/java/com/winterbe/java8/samples/stream/Streams13.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams13.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams13.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams2.java b/src/main/java/com/winterbe/java8/samples/stream/Streams2.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams2.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams2.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams3.java b/src/main/java/com/winterbe/java8/samples/stream/Streams3.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams3.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams3.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams4.java b/src/main/java/com/winterbe/java8/samples/stream/Streams4.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams4.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams4.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams5.java b/src/main/java/com/winterbe/java8/samples/stream/Streams5.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams5.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams5.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams6.java b/src/main/java/com/winterbe/java8/samples/stream/Streams6.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams6.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams6.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams7.java b/src/main/java/com/winterbe/java8/samples/stream/Streams7.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams7.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams7.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams8.java b/src/main/java/com/winterbe/java8/samples/stream/Streams8.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams8.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams8.java
diff --git a/src/com/winterbe/java8/samples/stream/Streams9.java b/src/main/java/com/winterbe/java8/samples/stream/Streams9.java
similarity index 100%
rename from src/com/winterbe/java8/samples/stream/Streams9.java
rename to src/main/java/com/winterbe/java8/samples/stream/Streams9.java
diff --git a/src/com/winterbe/java8/samples/time/LocalDate1.java b/src/main/java/com/winterbe/java8/samples/time/LocalDate1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/time/LocalDate1.java
rename to src/main/java/com/winterbe/java8/samples/time/LocalDate1.java
diff --git a/src/com/winterbe/java8/samples/time/LocalDateTime1.java b/src/main/java/com/winterbe/java8/samples/time/LocalDateTime1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/time/LocalDateTime1.java
rename to src/main/java/com/winterbe/java8/samples/time/LocalDateTime1.java
diff --git a/src/com/winterbe/java8/samples/time/LocalTime1.java b/src/main/java/com/winterbe/java8/samples/time/LocalTime1.java
similarity index 100%
rename from src/com/winterbe/java8/samples/time/LocalTime1.java
rename to src/main/java/com/winterbe/java8/samples/time/LocalTime1.java