diff --git a/.gitignore b/.gitignore
index 98b27a2..04cd85f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /.settings
 
 # netbeans
+/nb-configuration.xml
 /nbbuild.xml
 /nbproject
 
diff --git a/LogBlockQuestioner.jar b/LogBlockQuestioner.jar
new file mode 100644
index 0000000..aa16a48
Binary files /dev/null and b/LogBlockQuestioner.jar differ
diff --git a/MANIFEST.MF b/MANIFEST.MF
deleted file mode 100644
index cc2e933..0000000
--- a/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: ../lib/WorldEdit.jar ../WorldEdit.jar
-
diff --git a/build.xml b/build.xml
deleted file mode 100644
index cf0d23f..0000000
--- a/build.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<project default="logblock">
-	<target name="logblock">
-		<mkdir dir="lib/"/>
-		<mkdir dir="bin/"/>
-		<get src="http://dl.bukkit.org/latest-rb/bukkit.jar" dest="lib/bukkit.jar"/>
-		<get src="http://dl.bukkit.org/latest-rb/craftbukkit.jar" dest="lib/craftbukkit.jar"/>
-		<get src="http://cloud.github.com/downloads/sk89q/worldedit/worldedit-4.6.zip" dest="WorldEdit.zip"/>
-		<unzip src="WorldEdit.zip" dest="lib/"><patternset><include name="WorldEdit.jar"/></patternset></unzip>
-		<delete file="WorldEdit.zip"/>
-		<get src="http://cloud.github.com/downloads/DiddiZ/LogBlockQuestioner/LogBlockQuestioner%20v0.02.zip" dest="LogBlockQuestioner.zip"/>
-		<unzip src="LogBlockQuestioner.zip" dest="lib/"><patternset><include name="LogBlockQuestioner.jar"/></patternset></unzip>
-		<delete file="LogBlockQuestioner.zip"/>
-		<javac srcdir="src/" destdir="bin/" classpath="lib/bukkit.jar;lib/craftbukkit.jar;lib/WorldEdit.jar;lib/LogBlockQuestioner.jar" debug="true" debuglevel="lines,source" includeantruntime="false"/>
-		<jar destfile="LogBlock.jar" manifest="MANIFEST.MF">
-			<fileset dir="bin/"/>
-			<fileset file="src/plugin.yml"/>
-		</jar>
-	</target>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..ac07c52
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,109 @@
+
+<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>de.diddiz</groupId>
+	<artifactId>logblock</artifactId>
+	<version>dev-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>LogBlock</name>
+	<description>Logs blocks.</description>
+	<url>https://github.com/LogBlock/LogBlock</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<build.number>Unknown</build.number>
+	</properties>
+
+	<scm>
+		<connection>scm:git:git://github.com/LogBlock/LogBlock.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:LogBlock/LogBlock.git</developerConnection>
+		<url>https://github.com/LogBlock/LogBlock</url>
+	</scm>
+
+	<ciManagement>
+		<system>jenkins</system>
+		<url>http://ci.kitteh.org/job/LogBlock</url>
+	</ciManagement>
+
+	<distributionManagement>
+		<repository>
+			<id>kittehReleases</id>
+			<name>Kitteh Releases</name>
+			<url>http://repo.kitteh.org/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>kittehSnapshots</id>
+			<name>Kitteh Snapshots</name>
+			<url>http://repo.kitteh.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.2.5-R4.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>questioner</artifactId>
+			<version>${project.version}</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/LogBlockQuestioner.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.sk89q</groupId>
+			<artifactId>worldedit</artifactId>
+			<version>5.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.spout</groupId>
+					<artifactId>spoutapi</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.spout</groupId>
+					<artifactId>vanilla</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>repobo-snap</id>
+			<url>http://repo.bukkit.org/content/groups/public</url>
+		</repository>
+		<repository>
+			<id>sk89q-repo</id>
+			<url>http://maven.sk89q.com/repo/</url>
+		</repository>
+		<repository>
+			<id>kitteh-repo</id>
+			<url>http://repo.kitteh.org/content/groups/public</url>
+		</repository>
+	</repositories>
+
+	<build>
+		<finalName>${project.name}</finalName>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>${project.basedir}/src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/src/de/diddiz/LogBlock/AutoClearLog.java b/src/main/java/de/diddiz/LogBlock/AutoClearLog.java
similarity index 100%
rename from src/de/diddiz/LogBlock/AutoClearLog.java
rename to src/main/java/de/diddiz/LogBlock/AutoClearLog.java
diff --git a/src/de/diddiz/LogBlock/BlockChange.java b/src/main/java/de/diddiz/LogBlock/BlockChange.java
similarity index 100%
rename from src/de/diddiz/LogBlock/BlockChange.java
rename to src/main/java/de/diddiz/LogBlock/BlockChange.java
diff --git a/src/de/diddiz/LogBlock/ChatMessage.java b/src/main/java/de/diddiz/LogBlock/ChatMessage.java
similarity index 100%
rename from src/de/diddiz/LogBlock/ChatMessage.java
rename to src/main/java/de/diddiz/LogBlock/ChatMessage.java
diff --git a/src/de/diddiz/LogBlock/ChestAccess.java b/src/main/java/de/diddiz/LogBlock/ChestAccess.java
similarity index 100%
rename from src/de/diddiz/LogBlock/ChestAccess.java
rename to src/main/java/de/diddiz/LogBlock/ChestAccess.java
diff --git a/src/de/diddiz/LogBlock/CommandsHandler.java b/src/main/java/de/diddiz/LogBlock/CommandsHandler.java
similarity index 100%
rename from src/de/diddiz/LogBlock/CommandsHandler.java
rename to src/main/java/de/diddiz/LogBlock/CommandsHandler.java
diff --git a/src/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Consumer.java
rename to src/main/java/de/diddiz/LogBlock/Consumer.java
diff --git a/src/de/diddiz/LogBlock/DumpedLogImporter.java b/src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java
similarity index 100%
rename from src/de/diddiz/LogBlock/DumpedLogImporter.java
rename to src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java
diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java
similarity index 100%
rename from src/de/diddiz/LogBlock/LogBlock.java
rename to src/main/java/de/diddiz/LogBlock/LogBlock.java
diff --git a/src/de/diddiz/LogBlock/Logging.java b/src/main/java/de/diddiz/LogBlock/Logging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Logging.java
rename to src/main/java/de/diddiz/LogBlock/Logging.java
diff --git a/src/de/diddiz/LogBlock/LookupCacheElement.java b/src/main/java/de/diddiz/LogBlock/LookupCacheElement.java
similarity index 100%
rename from src/de/diddiz/LogBlock/LookupCacheElement.java
rename to src/main/java/de/diddiz/LogBlock/LookupCacheElement.java
diff --git a/src/de/diddiz/LogBlock/LookupCacheElementFactory.java b/src/main/java/de/diddiz/LogBlock/LookupCacheElementFactory.java
similarity index 100%
rename from src/de/diddiz/LogBlock/LookupCacheElementFactory.java
rename to src/main/java/de/diddiz/LogBlock/LookupCacheElementFactory.java
diff --git a/src/de/diddiz/LogBlock/Metrics.java b/src/main/java/de/diddiz/LogBlock/Metrics.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Metrics.java
rename to src/main/java/de/diddiz/LogBlock/Metrics.java
diff --git a/src/de/diddiz/LogBlock/QueryParams.java b/src/main/java/de/diddiz/LogBlock/QueryParams.java
similarity index 100%
rename from src/de/diddiz/LogBlock/QueryParams.java
rename to src/main/java/de/diddiz/LogBlock/QueryParams.java
diff --git a/src/de/diddiz/LogBlock/Session.java b/src/main/java/de/diddiz/LogBlock/Session.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Session.java
rename to src/main/java/de/diddiz/LogBlock/Session.java
diff --git a/src/de/diddiz/LogBlock/SummedBlockChanges.java b/src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java
similarity index 100%
rename from src/de/diddiz/LogBlock/SummedBlockChanges.java
rename to src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java
diff --git a/src/de/diddiz/LogBlock/Tool.java b/src/main/java/de/diddiz/LogBlock/Tool.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Tool.java
rename to src/main/java/de/diddiz/LogBlock/Tool.java
diff --git a/src/de/diddiz/LogBlock/ToolBehavior.java b/src/main/java/de/diddiz/LogBlock/ToolBehavior.java
similarity index 100%
rename from src/de/diddiz/LogBlock/ToolBehavior.java
rename to src/main/java/de/diddiz/LogBlock/ToolBehavior.java
diff --git a/src/de/diddiz/LogBlock/ToolData.java b/src/main/java/de/diddiz/LogBlock/ToolData.java
similarity index 100%
rename from src/de/diddiz/LogBlock/ToolData.java
rename to src/main/java/de/diddiz/LogBlock/ToolData.java
diff --git a/src/de/diddiz/LogBlock/ToolMode.java b/src/main/java/de/diddiz/LogBlock/ToolMode.java
similarity index 100%
rename from src/de/diddiz/LogBlock/ToolMode.java
rename to src/main/java/de/diddiz/LogBlock/ToolMode.java
diff --git a/src/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java
similarity index 100%
rename from src/de/diddiz/LogBlock/Updater.java
rename to src/main/java/de/diddiz/LogBlock/Updater.java
diff --git a/src/de/diddiz/LogBlock/WorldEditor.java b/src/main/java/de/diddiz/LogBlock/WorldEditor.java
similarity index 100%
rename from src/de/diddiz/LogBlock/WorldEditor.java
rename to src/main/java/de/diddiz/LogBlock/WorldEditor.java
diff --git a/src/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java
similarity index 100%
rename from src/de/diddiz/LogBlock/config/Config.java
rename to src/main/java/de/diddiz/LogBlock/config/Config.java
diff --git a/src/de/diddiz/LogBlock/config/WorldConfig.java b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
similarity index 100%
rename from src/de/diddiz/LogBlock/config/WorldConfig.java
rename to src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
diff --git a/src/de/diddiz/LogBlock/listeners/BanListener.java b/src/main/java/de/diddiz/LogBlock/listeners/BanListener.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/BanListener.java
rename to src/main/java/de/diddiz/LogBlock/listeners/BanListener.java
diff --git a/src/de/diddiz/LogBlock/listeners/BlockBreakLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/BlockBreakLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/BlockBurnLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/BlockBurnLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/ChatLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ChatLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/ChatLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/ChatLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/ChestAccessLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/ChestAccessLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/EndermenLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/EndermenLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/EndermenLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/EndermenLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/ExplosionLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/ExplosionLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/FluidFlowLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/FluidFlowLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/InteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/InteractLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/KillLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/KillLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/LoggingListener.java b/src/main/java/de/diddiz/LogBlock/listeners/LoggingListener.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/LoggingListener.java
rename to src/main/java/de/diddiz/LogBlock/listeners/LoggingListener.java
diff --git a/src/de/diddiz/LogBlock/listeners/PlayerInfoLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/PlayerInfoLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/PlayerInfoLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/PlayerInfoLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/SignChangeLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/SignChangeLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/SignChangeLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/SignChangeLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/SnowFadeLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/SnowFadeLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/SnowFadeLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/SnowFadeLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/SnowFormLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/SnowFormLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/SnowFormLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/SnowFormLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/StructureGrowLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/StructureGrowLogging.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/StructureGrowLogging.java
rename to src/main/java/de/diddiz/LogBlock/listeners/StructureGrowLogging.java
diff --git a/src/de/diddiz/LogBlock/listeners/ToolListener.java b/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
similarity index 100%
rename from src/de/diddiz/LogBlock/listeners/ToolListener.java
rename to src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
diff --git a/src/de/diddiz/util/Block.java b/src/main/java/de/diddiz/util/Block.java
similarity index 100%
rename from src/de/diddiz/util/Block.java
rename to src/main/java/de/diddiz/util/Block.java
diff --git a/src/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/util/BukkitUtils.java
similarity index 100%
rename from src/de/diddiz/util/BukkitUtils.java
rename to src/main/java/de/diddiz/util/BukkitUtils.java
diff --git a/src/de/diddiz/util/MaterialName.java b/src/main/java/de/diddiz/util/MaterialName.java
similarity index 100%
rename from src/de/diddiz/util/MaterialName.java
rename to src/main/java/de/diddiz/util/MaterialName.java
diff --git a/src/de/diddiz/util/MySQLConnectionPool.java b/src/main/java/de/diddiz/util/MySQLConnectionPool.java
similarity index 100%
rename from src/de/diddiz/util/MySQLConnectionPool.java
rename to src/main/java/de/diddiz/util/MySQLConnectionPool.java
diff --git a/src/de/diddiz/util/Utils.java b/src/main/java/de/diddiz/util/Utils.java
similarity index 100%
rename from src/de/diddiz/util/Utils.java
rename to src/main/java/de/diddiz/util/Utils.java
diff --git a/src/plugin.yml b/src/main/resources/plugin.yml
similarity index 95%
rename from src/plugin.yml
rename to src/main/resources/plugin.yml
index 48d46e7..6e7ec1a 100644
--- a/src/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,9 +1,9 @@
-name: LogBlock
+name: ${project.name}
 version: '1.54'
 author: DiddiZ
 website: http://www.diddiz.de/minecraft/
 main: de.diddiz.LogBlock.LogBlock
-description: Logs blocks.
+description: ${project.description}
 softdepend: [LogBlockQuestioner, WorldEdit]
 commands:
   lb: