diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index da84ac3..c59fe94 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,6 +17,13 @@
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="IconLoader" />
+      </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.6" />
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f6b06cb..ccf88d1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,14 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
index 1348a4e..3f3451d 100644
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All Tests" type="JUnit" factoryName="JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="IconLoader" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
diff --git a/IconLoader.iml b/IconLoader.iml
index 9ec0168..7f8baa0 100644
--- a/IconLoader.iml
+++ b/IconLoader.iml
@@ -1,16 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="eawtstub" level="project" />
     <orderEntry type="library" scope="TEST" name="junit" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.apple:eawt:1.0.0">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/eawtstub.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
 
diff --git a/build.xml b/build.xml
index 51a5e87..52127d5 100644
--- a/build.xml
+++ b/build.xml
@@ -126,7 +126,7 @@
   
   <path id="iconloader.module.sourcepath">
     <dirset dir="${module.iconloader.basedir}">
-      <include name="src"/>
+      <include name="src/main/java"/>
     </dirset>
   </path>
   
@@ -144,7 +144,7 @@
     </javac>
     
     <copy todir="${iconloader.output.dir}">
-      <fileset dir="${module.iconloader.basedir}/src">
+      <fileset dir="${module.iconloader.basedir}/src/main/java">
         <patternset refid="compiler.resources"/>
         <type type="file"/>
       </fileset>
diff --git a/iconloader.jar b/iconloader.jar
deleted file mode 100644
index a32173d..0000000
Binary files a/iconloader.jar and /dev/null differ
diff --git a/lib/junit-4.10.jar b/lib/junit-4.10.jar
deleted file mode 100644
index bf5c0b9..0000000
Binary files a/lib/junit-4.10.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..fcca31a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2000-2014 JetBrains s.r.o.
+  ~
+  ~ Licensed 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.
+  -->
+
+<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.bulenkov</groupId>
+	<artifactId>iconloader</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>IconLoader</name>
+	<organization>
+		<name>Konstantin Bulenkov</name>
+		<url>http://bulenkov.com</url>
+	</organization>
+
+	<scm>
+		<developerConnection>scm:git:git@github.com:bulenkov/iconloader.git</developerConnection>
+		<connection>scm:git:git@github.com:bulenkov/iconloader.git</connection>
+		<url>https://github.com/bulenkov/iconloader</url>
+		<tag>HEAD</tag>
+	</scm>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus snapshot repository</name>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>sonatype-nexus-staging</id>
+			<name>Sonatype Nexus release repository</name>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.apple</groupId>
+			<artifactId>eawt</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/eawtstub.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/resources/META-INF/MANIFEST.MF b/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index b7b428a..0000000
--- a/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: IconLoader
-Implementation-Version: 1.0.0
-Implementation-Vendor: Konstantin Bulenkov
-Implementation-URL: http://bulenkov.com
diff --git a/src/com/bulenkov/iconloader/AppleHiDPIScaledImage.java b/src/main/java/com/bulenkov/iconloader/AppleHiDPIScaledImage.java
similarity index 100%
rename from src/com/bulenkov/iconloader/AppleHiDPIScaledImage.java
rename to src/main/java/com/bulenkov/iconloader/AppleHiDPIScaledImage.java
diff --git a/src/com/bulenkov/iconloader/HiDPIScaledGraphics.java b/src/main/java/com/bulenkov/iconloader/HiDPIScaledGraphics.java
similarity index 100%
rename from src/com/bulenkov/iconloader/HiDPIScaledGraphics.java
rename to src/main/java/com/bulenkov/iconloader/HiDPIScaledGraphics.java
diff --git a/src/com/bulenkov/iconloader/IconLoader.java b/src/main/java/com/bulenkov/iconloader/IconLoader.java
similarity index 100%
rename from src/com/bulenkov/iconloader/IconLoader.java
rename to src/main/java/com/bulenkov/iconloader/IconLoader.java
diff --git a/src/com/bulenkov/iconloader/IsRetina.java b/src/main/java/com/bulenkov/iconloader/IsRetina.java
similarity index 100%
rename from src/com/bulenkov/iconloader/IsRetina.java
rename to src/main/java/com/bulenkov/iconloader/IsRetina.java
diff --git a/src/com/bulenkov/iconloader/JBHiDPIScaledImage.java b/src/main/java/com/bulenkov/iconloader/JBHiDPIScaledImage.java
similarity index 100%
rename from src/com/bulenkov/iconloader/JBHiDPIScaledImage.java
rename to src/main/java/com/bulenkov/iconloader/JBHiDPIScaledImage.java
diff --git a/src/com/bulenkov/iconloader/RetinaImage.java b/src/main/java/com/bulenkov/iconloader/RetinaImage.java
similarity index 100%
rename from src/com/bulenkov/iconloader/RetinaImage.java
rename to src/main/java/com/bulenkov/iconloader/RetinaImage.java
diff --git a/src/com/bulenkov/iconloader/util/ArrayUtilRt.java b/src/main/java/com/bulenkov/iconloader/util/ArrayUtilRt.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/ArrayUtilRt.java
rename to src/main/java/com/bulenkov/iconloader/util/ArrayUtilRt.java
diff --git a/src/com/bulenkov/iconloader/util/AsyncByteArrayOutputStream.java b/src/main/java/com/bulenkov/iconloader/util/AsyncByteArrayOutputStream.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/AsyncByteArrayOutputStream.java
rename to src/main/java/com/bulenkov/iconloader/util/AsyncByteArrayOutputStream.java
diff --git a/src/com/bulenkov/iconloader/util/Base64Converter.java b/src/main/java/com/bulenkov/iconloader/util/Base64Converter.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/Base64Converter.java
rename to src/main/java/com/bulenkov/iconloader/util/Base64Converter.java
diff --git a/src/com/bulenkov/iconloader/util/BufferExposingByteArrayOutputStream.java b/src/main/java/com/bulenkov/iconloader/util/BufferExposingByteArrayOutputStream.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/BufferExposingByteArrayOutputStream.java
rename to src/main/java/com/bulenkov/iconloader/util/BufferExposingByteArrayOutputStream.java
diff --git a/src/com/bulenkov/iconloader/util/CenteredIcon.java b/src/main/java/com/bulenkov/iconloader/util/CenteredIcon.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/CenteredIcon.java
rename to src/main/java/com/bulenkov/iconloader/util/CenteredIcon.java
diff --git a/src/com/bulenkov/iconloader/util/ColorUtil.java b/src/main/java/com/bulenkov/iconloader/util/ColorUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/ColorUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/ColorUtil.java
diff --git a/src/com/bulenkov/iconloader/util/ComparingUtils.java b/src/main/java/com/bulenkov/iconloader/util/ComparingUtils.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/ComparingUtils.java
rename to src/main/java/com/bulenkov/iconloader/util/ComparingUtils.java
diff --git a/src/com/bulenkov/iconloader/util/ConcurrencyUtil.java b/src/main/java/com/bulenkov/iconloader/util/ConcurrencyUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/ConcurrencyUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/ConcurrencyUtil.java
diff --git a/src/com/bulenkov/iconloader/util/DoubleColor.java b/src/main/java/com/bulenkov/iconloader/util/DoubleColor.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/DoubleColor.java
rename to src/main/java/com/bulenkov/iconloader/util/DoubleColor.java
diff --git a/src/com/bulenkov/iconloader/util/EmptyIcon.java b/src/main/java/com/bulenkov/iconloader/util/EmptyIcon.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/EmptyIcon.java
rename to src/main/java/com/bulenkov/iconloader/util/EmptyIcon.java
diff --git a/src/com/bulenkov/iconloader/util/GraphicsConfig.java b/src/main/java/com/bulenkov/iconloader/util/GraphicsConfig.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/GraphicsConfig.java
rename to src/main/java/com/bulenkov/iconloader/util/GraphicsConfig.java
diff --git a/src/com/bulenkov/iconloader/util/GraphicsUtil.java b/src/main/java/com/bulenkov/iconloader/util/GraphicsUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/GraphicsUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/GraphicsUtil.java
diff --git a/src/com/bulenkov/iconloader/util/Gray.java b/src/main/java/com/bulenkov/iconloader/util/Gray.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/Gray.java
rename to src/main/java/com/bulenkov/iconloader/util/Gray.java
diff --git a/src/com/bulenkov/iconloader/util/Pair.java b/src/main/java/com/bulenkov/iconloader/util/Pair.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/Pair.java
rename to src/main/java/com/bulenkov/iconloader/util/Pair.java
diff --git a/src/com/bulenkov/iconloader/util/Ref.java b/src/main/java/com/bulenkov/iconloader/util/Ref.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/Ref.java
rename to src/main/java/com/bulenkov/iconloader/util/Ref.java
diff --git a/src/com/bulenkov/iconloader/util/ReflectionUtil.java b/src/main/java/com/bulenkov/iconloader/util/ReflectionUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/ReflectionUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/ReflectionUtil.java
diff --git a/src/com/bulenkov/iconloader/util/StringFactory.java b/src/main/java/com/bulenkov/iconloader/util/StringFactory.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/StringFactory.java
rename to src/main/java/com/bulenkov/iconloader/util/StringFactory.java
diff --git a/src/com/bulenkov/iconloader/util/StringUtil.java b/src/main/java/com/bulenkov/iconloader/util/StringUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/StringUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/StringUtil.java
diff --git a/src/com/bulenkov/iconloader/util/SystemInfo.java b/src/main/java/com/bulenkov/iconloader/util/SystemInfo.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/SystemInfo.java
rename to src/main/java/com/bulenkov/iconloader/util/SystemInfo.java
diff --git a/src/com/bulenkov/iconloader/util/UIUtil.java b/src/main/java/com/bulenkov/iconloader/util/UIUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/UIUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/UIUtil.java
diff --git a/src/com/bulenkov/iconloader/util/URLUtil.java b/src/main/java/com/bulenkov/iconloader/util/URLUtil.java
similarity index 100%
rename from src/com/bulenkov/iconloader/util/URLUtil.java
rename to src/main/java/com/bulenkov/iconloader/util/URLUtil.java
diff --git a/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from resources/META-INF/LICENSE
rename to src/main/resources/META-INF/LICENSE
diff --git a/tests/com/bulenkov/iconloader/IconLoaderTest.java b/src/test/java/com/bulenkov/iconloader/IconLoaderTest.java
similarity index 100%
rename from tests/com/bulenkov/iconloader/IconLoaderTest.java
rename to src/test/java/com/bulenkov/iconloader/IconLoaderTest.java
diff --git a/tests/com/bulenkov/iconloader/IconLoaderTestCase.java b/src/test/java/com/bulenkov/iconloader/IconLoaderTestCase.java
similarity index 100%
rename from tests/com/bulenkov/iconloader/IconLoaderTestCase.java
rename to src/test/java/com/bulenkov/iconloader/IconLoaderTestCase.java
diff --git a/tests/icons/print.png b/src/test/resources/icons/print.png
similarity index 100%
rename from tests/icons/print.png
rename to src/test/resources/icons/print.png
diff --git a/tests/icons/print@2x.png b/src/test/resources/icons/print@2x.png
similarity index 100%
rename from tests/icons/print@2x.png
rename to src/test/resources/icons/print@2x.png
diff --git a/tests/icons/print@2x_dark.png b/src/test/resources/icons/print@2x_dark.png
similarity index 100%
rename from tests/icons/print@2x_dark.png
rename to src/test/resources/icons/print@2x_dark.png
diff --git a/tests/icons/printPreview.png b/src/test/resources/icons/printPreview.png
similarity index 100%
rename from tests/icons/printPreview.png
rename to src/test/resources/icons/printPreview.png
diff --git a/tests/icons/print_dark.png b/src/test/resources/icons/print_dark.png
similarity index 100%
rename from tests/icons/print_dark.png
rename to src/test/resources/icons/print_dark.png