diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f2564bc4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+target/
diff --git a/INSTALL b/INSTALL
old mode 100755
new mode 100644
diff --git a/README b/README
old mode 100755
new mode 100644
diff --git a/blocks.properties b/blocks.properties
deleted file mode 100755
index b9e4d4fb..00000000
--- a/blocks.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# Dont edit this file. Make a copy 
-# of this file to 'local.blocks.properties'
-# and edit only 'local.blocks.properties'
-#
-# Enable a block by changing the block.MYBLOCK to 'true'
-
-#
-#  Cocoon block
-#  ------------
-# 
-# the cocoon-libraries are needed.
-# you can simple point to a WEB-INF/lib-
-# folder of a cocoon-webapp
-
-#block.cocoon=false
-#block.cocoon.dependency=svg
-#  Comment out and set the path to the webapp directory
-#cocoon.libs= /path/to/cocoon/webapp/WEB-INF/lib
-
-# If you want to use the deplay target 
-# set the right path here
-#cocoon.webapp=/path/to/cocoon/webapp/
-
-#
-#   SVG Block
-#   ---------
-#  SVGGenerator/Viewer and tools-block
-#
-block.svg=true
-
-#
-#  The Inkscape block
-#  ------------------
-
-block.inkscape=true
-block.inkscape.dependency=svg
-
-#  Options: 
-#        native (depence on gcj or setup other java compiler)
-#        java    (default, needs a java environment to run) 
-#        mono    (build depends on ikvm and .NET (mono on Linux/Unix), runs on .NET + ikvm dll's) 
-inkscape.importfilter.type=java
-
-# You change the compiler settings  here
-inkscape.java.compiler=gcj
-inkscape.java.compiler.properties= -findirect-dispatch -Wl,-Bsymbolic -O3
-
-#
-#  The XSLT tools block
-#  --------------------
-#
-#  XSLT filter
-block.xslt=true
-
-
diff --git a/blocks/cocoon/build.xml b/blocks/cocoon/build.xml
deleted file mode 100755
index ee828c2d..00000000
--- a/blocks/cocoon/build.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="dxf2svg" default="dist" basedir=".">
-	<property name="homepath" value="" />
-	<property name="block.releasename" value="kabeja-dxf2svg-cocoon-${releaseversion}" />
-	<property name="src" value="src" />
-	<property name="sources" value="java" />
-	<property name="classes" value="classes" />
-	<property name="test" value="test" />
-	<property name="build" value="build" />
-	<property name="dist" value="dist" />
-	<property name="help" value="doc" />
-	<property name="icons" value="icons" />
-	<property name="lang" value="lang" />
-	<property name="conf" value="conf" />
-	<property name="libs" value="lib" />
-	<property name="sample" value="sample" />
-	<property name="manifest" value="manifestfile" />
-
-	<property name="packages" value="packages" />
-	<property name="samples" value="samples" />
-	<property name="apidocs" value="javadoc" />
-	<property name="docs" value="doc" />
-	<property name="JarClassPath" value="" />
-	<property name="tempdir" value="tmp" />
-	<property name="tools" value="tools" />
-	<property name="kabeja.home" value="../.." />
-	<property name="cocoon.webapp" value="${cocoon.libs}/../.." />
-
-
-	<description>
-	</description>
-
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${classes}" />
-		<mkdir dir="${dist}" />
-		<mkdir dir="${dist}/${libs}" />
-
-	</target>
-
-	<target name="compile" depends="init">
-		<javac srcdir="${src}/${sources}" destdir="${build}/${classes}" target="${java.target.version}" source="${java.target.version}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${cocoon.libs}/">
-					<include name="**/*.jar" />
-				</fileset>
-				<dirset dir="${kabeja.home}/${build}/${classes}" />
-				<fileset dir="${kabeja.home}/${dist}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-
-
-
-	<target name="dist" depends="compile,manifest">
-		<jar jarfile="${kabeja.home}/${dist}/${libs}/${block.releasename}.jar" basedir="${build}/${classes}" includes="**/*" manifest="${manifest}" />
-		<delete file="${manifest}" />
-	</target>
-
-
-
-
-
-
-
-
-
-	<target name="clean">
-		<delete dir="${build}" />
-		<delete dir="${dist}" />
-		<delete dir="${packages}" />
-		<delete dir="${tempdir}" />
-		<delete dir="subsitemap-demo/kabeja/dxf" />
-	</target>
-
-	<target name="javadoc">
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${apidocs}" />
-		<javadoc packagenames="*.*.*" sourcepath="${src}/${sources}" destdir="${kabeja.home}/${build}/${apidocs}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement path="${build}/${classes}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-
-	<!-- new manifest section here -->
-	<target name="manifest">
-		<fileset dir="${libs}" id="jar.files">
-			<include name="*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="jars" refid="jar.files">
-			<map from="${basedir}/" to="" />
-		</pathconvert>
-		<manifest file="${manifest}">
-			<attribute name="Main-Class" value="${MainClass}" />
-			<attribute name="Class-Path" value="${jars}" />
-		</manifest>
-	</target>
-
-
-	<!-- for direct deploy -->
-	<target name="deploy" depends="dist" if="cocoon.webapp">
-		<jar jarfile="${cocoon.libs}/${block.releasename}.jar">
-			<fileset dir="${build}/${classes}" />
-			<fileset dir="${kabeja.home}/${build}/${classes}" />
-		</jar>
-		<copy todir="subsitemap-demo/kabeja/dxf">
-			<fileset dir="${kabeja.home}/samples/dxf">
-				<include name="*.dxf" />
-			</fileset>
-		</copy>
-		<mkdir dir="${cocoon.webapp}/kabeja" />
-		<copy todir="${cocoon.webapp}/kabeja">
-			<fileset dir="subsitemap-demo/kabeja">
-				<include name="**/*" />
-				<exclude name="**/cvs/*" />
-				<exclude name="**/cvs" />
-			</fileset>
-		</copy>
-		<copy todir="${cocoon.webapp}/WEB-INF/lib">
-			<fileset dir="${kabeja.home}/${dist}/${libs}">
-				<include name="kabeja*.jar" />
-				<exclude name="**/cvs/*" />
-				<exclude name="**/cvs" />
-			</fileset>
-		</copy>
-
-	</target>
-
-</project>
-
diff --git a/blocks/cocoon/lib/nothing b/blocks/cocoon/lib/nothing
deleted file mode 100755
index e69de29b..00000000
diff --git a/blocks/cocoon/pom.xml b/blocks/cocoon/pom.xml
new file mode 100644
index 00000000..0f48e250
--- /dev/null
+++ b/blocks/cocoon/pom.xml
@@ -0,0 +1,30 @@
+<?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>
+    <artifactId>kabeja-cocoon</artifactId>
+    <name>Kabeja Cocoon module</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.kabeja</groupId>
+        <artifactId>kabeja</artifactId>
+        <version>0.4.2-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cocoon</groupId>
+            <artifactId>cocoon-core</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.kabeja</groupId>
+            <artifactId>kabeja-svg</artifactId>
+            <version>0.4.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/blocks/cocoon/src/java/org/kabeja/cocoon/generation/DXF2SVGGenerator.java b/blocks/cocoon/src/main/java/org/kabeja/cocoon/generation/DXF2SVGGenerator.java
similarity index 100%
rename from blocks/cocoon/src/java/org/kabeja/cocoon/generation/DXF2SVGGenerator.java
rename to blocks/cocoon/src/main/java/org/kabeja/cocoon/generation/DXF2SVGGenerator.java
diff --git a/blocks/cocoon/src/java/org/kabeja/cocoon/transformation/SAXFilter2TransformerAdapter.java b/blocks/cocoon/src/main/java/org/kabeja/cocoon/transformation/SAXFilter2TransformerAdapter.java
similarity index 100%
rename from blocks/cocoon/src/java/org/kabeja/cocoon/transformation/SAXFilter2TransformerAdapter.java
rename to blocks/cocoon/src/main/java/org/kabeja/cocoon/transformation/SAXFilter2TransformerAdapter.java
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/index.xhtml b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/index.xhtml
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/index.xhtml
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/index.xhtml
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/sitemap.xmap b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/sitemap.xmap
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/sitemap.xmap
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/sitemap.xmap
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/dir2html.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/dir2html.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/dir2html.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/dir2html.xsl
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/header.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/header.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/header.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/header.xsl
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/hlsvg.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/hlsvg.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/hlsvg.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/hlsvg.xsl
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/splitsvg.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/splitsvg.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/splitsvg.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/splitsvg.xsl
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/svg2fo.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/svg2fo.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/svg2fo.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/svg2fo.xsl
diff --git a/blocks/cocoon/subsitemap-demo/kabeja/xsl/svg2html.xsl b/blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/svg2html.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/cocoon/subsitemap-demo/kabeja/xsl/svg2html.xsl
rename to blocks/cocoon/src/main/resources/subsitemap-demo/kabeja/xsl/svg2html.xsl
diff --git a/blocks/inkscape/build.xml b/blocks/inkscape/build.xml
deleted file mode 100755
index 1a8d0c00..00000000
--- a/blocks/inkscape/build.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Inkscape-ImportFilter" default="dist" basedir=".">
-	<property name="homepath" value="" />
-	<property name="block.releasename" value="kabeja-inkscape-dxf2svg" />
-	<property name="releaseversion" value="0.4" />
-	<property name="src" value="src" />
-	<property name="sources" value="java" />
-	<property name="classes" value="classes" />
-	<property name="test" value="test" />
-	<property name="build" value="build" />
-	<property name="dist" value="dist" />
-	<property name="help" value="doc" />
-	<property name="icons" value="icons" />
-	<property name="lang" value="lang" />
-	<property name="conf" value="conf" />
-	<property name="libs" value="lib" />
-	<property name="sample" value="sample" />
-	<property name="manifest" value="inkscape.manifestfile" />
-	<property name="version" value="0.4" />
-	<property name="packages" value="packages" />
-	<property name="samples" value="samples" />
-	<property name="apidocs" value="javadoc" />
-	<property name="docs" value="doc" />
-	<property name="JarClassPath" value="" />
-	<property name="tempdir" value="tmp" />
-	<property name="tools" value="tools" />
-	<property name="kabeja.home" value="../.." />
-	<property name="inkscape.java.compiler.properties" value=" -findirect-dispatch -Wl,-Bsymbolic -O3" />
-	<property name="inkscape.java.compiler" value="gcj" />
-	<property name="main.class" value="org.kabeja.inkscape.DXFImportFilter" />
-	<property name="name.binary" value="kabeja-dxf2svg" />
-	<property name="inkscape.importfilter.install.path" value="${kabeja.home}/dist" />
-	<property name="inkscape.importfilter.type" value="java" />
-	<property name="install.dir" value="${user.home}/.inkscape/extensions" />
-
-	<description>
-		This is a kabeja-based import filter
-	</description>
-
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${classes}" />
-		<mkdir dir="${dist}" />
-		<mkdir dir="${dist}/${libs}" />
-	</target>
-
-	<target name="compile" depends="init,manifest,extension-jar">
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="native" />
-			<then>
-				<echo>Native import filter</echo>
-
-				<exec executable="gcj">
-					<arg line=" ${inkscape.java.compiler.properties} --main=${main.class} -o ${basedir}/${dist}/${name.binary} ${basedir}/${dist}/${block.releasename}.jar" />
-				</exec>
-			</then>
-		</if>
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="java" />
-			<then>
-				<echo>Java import filter</echo>
-			</then>
-		</if>
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="mono" />
-			<then>
-				<echo>Mono DotNet import filter</echo>
-				<exec executable="ikvmc"> 
-					<arg line="-target:exe -main:${main.class} -out:&quot;${basedir}/${dist}/${name.binary}.exe&quot;  &quot;${basedir}/${dist}/${block.releasename}.jar&quot;" />
-				</exec>
-			</then>
-		</if>
-	</target>
-
-
-
-
-	<target name="dist" depends="compile">
-		<mkdir dir="${kabeja.home}/${dist}/inkscape-extension" />
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="native" />
-			<then>
-				<if>
-					<available file="${dist}/${name.binary}.exe" />
-					<then>
-						<exec executable="strip">
-							<arg line="${dist}/${name.binary}.exe" />
-						</exec>
-						<copy file="${dist}/${name.binary}.exe" todir="${kabeja.home}/${dist}/inkscape-extension" />
-						<chmod file="${kabeja.home}/${dist}/inkscape-extension/${name.binary}.exe" perm="+rx" />
-					</then>
-					<else>
-						<exec executable="strip">
-							<arg line="${dist}/${name.binary}" />
-						</exec>
-						<copy file="${dist}/${name.binary}" todir="${kabeja.home}/${dist}/inkscape-extension" />
-						<chmod file="${kabeja.home}/${dist}/inkscape-extension/${name.binary}" perm="+rx" />
-					</else>
-
-
-
-				</if>
-
-				<copy file="${conf}/kabeja-native.inx" tofile="${kabeja.home}/${dist}/inkscape-extension/kabeja.inx" />
-			</then>
-		</if>
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="java" />
-			<then>
-				<copy file="${dist}/${block.releasename}.jar" todir="${kabeja.home}/${dist}/inkscape-extension" />
-				<copy file="${conf}/kabeja.sh" tofile="${kabeja.home}/${dist}/inkscape-extension/kabeja" />
-				<chmod file="${kabeja.home}/${dist}/inkscape-extension/kabeja" perm="+rx" />
-				<copy file="${conf}/kabeja.bat" todir="${kabeja.home}/${dist}/inkscape-extension" />
-				<copy file="${conf}/kabeja-java.inx" tofile="${kabeja.home}/${dist}/inkscape-extension/kabeja.inx" />
-			</then>
-		</if>
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="mono" />
-			<then>
-				<copy file="${dist}/${name.binary}.exe" todir="${kabeja.home}/${dist}/inkscape-extension" />
-				<chmod file="${kabeja.home}/${dist}/inkscape-extension/${name.binary}.exe" perm="+rx" />
-				<copy file="${conf}/kabeja-mono.inx" tofile="${kabeja.home}/${dist}/inkscape-extension/kabeja.inx" />
-				<copy file="${conf}/kabeja-mono.sh" tofile="${kabeja.home}/${dist}/inkscape-extension/${name.binary}" />
-				<chmod file="${kabeja.home}/${dist}/inkscape-extension/${name.binary}" perm="+rx" />
-			</then>
-		</if>
-		
-		<jar jarfile="${kabeja.home}/${dist}/${libs}/${block.releasename}-${releaseversion}.jar" manifest="${manifest}">
-				<fileset dir="${build}/${classes}">
-					<include name="**/*" />
-				</fileset>
-	    </jar>	
-	</target>
-
-
-	<target name="extension-jar">
-		<javac destdir="${build}/${classes}" target="1.3" source="1.3">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${kabeja.home}/${dist}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-			<src path="${src}" />
-			<include name="**/*.java" />
-			<exclude name="**/CVS/*" />
-		</javac>
-
-		<mkdir dir="${build}/svg"/>
-		<unjar dest="${build}/svg">
-			<fileset dir="${kabeja.home}/${dist}/${libs}">
-				<include name="**/kabeja-svg*.jar" />
-			</fileset>
-		</unjar>
-		<jar jarfile="${dist}/${block.releasename}.jar" manifest="${manifest}">
-			<fileset dir="${kabeja.home}/${build}/${classes}">
-				<exclude name="org/kabeja/ui/**/*" />
-				<exclude name="org/kabeja/*" />
-				<!--	  -->
-				<include name="**/*" />
-			</fileset>
-			<fileset dir="${build}/svg">
-				<exclude name="org/kabeja/batik/**/*" />
-				<exclude name="org/kabeja/svg/ui/**/*" />
-				<exclude name="org/kabeja/svg/action/**/*" />
-				<exclude name="org/kabeja/svg/tools/**/*" />
-				<exclude name="org/kabeja/processing/**/*" />
-				<exclude name="org/kabeja/ui/**/*" />
-				<exclude name="dk/**/*" />
-			</fileset>
-			<fileset dir="${build}/${classes}">
-			</fileset>
-		</jar>
-	</target>
-
-
-
-
-	<target name="manifest">
-		<fileset dir="${libs}" id="jar.files">
-			<include name="*.jar" />
-		</fileset>
-		<manifest file="${manifest}">
-			<attribute name="Main-Class" value="${main.class}" />
-		</manifest>
-	</target>
-
-
-
-	<target name="install" depends="compile">
-		<if>
-			<equals arg1="${inkscape.importfilter.type}" arg2="native" />
-			<then>
-				<copy file="${dist}/${name.binary}" todir="${install.dir}" />
-				<chmod file="${install.dir}/${name.binary}" perm="+rx" />
-				<copy file="${conf}/kabeja-native.inx" tofile="${install.dir}/kabeja.inx" />
-			</then>
-			<else>
-				<jar jarfile="${install.dir}/${block.releasename}.jar" basedir="${build}/${classes}" includes="**/*" manifest="${manifest}" />
-				<if>
-					<os family="windows" />
-					<then>
-						<copy file="${conf}/kabeja.bat" todir="${install.dir}" />
-					</then>
-					<else>
-						<copy file="${conf}/kabeja.sh" tofile="${install.dir}/kabeja" />
-						<chmod file="${install.dir}/kabeja" perm="+rx" />
-					</else>
-				</if>
-				<copy file="${conf}/kabeja-java.inx" tofile="${install.dir}/kabeja.inx" />
-			</else>
-		</if>
-	</target>
-
-
-	<target name="remove">
-		<delete file="${install.dir}/${name.binary}" />
-		<delete file="${install.dir}/kabeja.inx" />
-	</target>
-
-
-
-	<target name="clean">
-		<delete dir="${build}" />
-		<delete dir="${dist}" />
-		<delete dir="${packages}" />
-		<delete dir="${tempdir}" />
-	</target>
-
-
-	<target name="javadoc">
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${apidocs}" />
-		<javadoc packagenames="*.*.*" sourcepath="${src}/${sources}" destdir="${kabeja.home}/${build}/${apidocs}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement path="${build}/${classes}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-
-
-
-</project>
-
diff --git a/blocks/inkscape/pom.xml b/blocks/inkscape/pom.xml
new file mode 100644
index 00000000..c31fce00
--- /dev/null
+++ b/blocks/inkscape/pom.xml
@@ -0,0 +1,25 @@
+<?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>
+    <artifactId>kabeja-inkscape</artifactId>
+    <name>Kabeja Inkscape module</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.kabeja</groupId>
+        <artifactId>kabeja</artifactId>
+        <version>0.4.2-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.kabeja</groupId>
+            <artifactId>kabeja-svg</artifactId>
+            <version>0.4.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/blocks/inkscape/src/org/kabeja/inkscape/DXFImportFilter.java b/blocks/inkscape/src/main/java/org/kabeja/inkscape/DXFImportFilter.java
similarity index 100%
rename from blocks/inkscape/src/org/kabeja/inkscape/DXFImportFilter.java
rename to blocks/inkscape/src/main/java/org/kabeja/inkscape/DXFImportFilter.java
diff --git a/blocks/inkscape/src/org/kabeja/inkscape/xml/SAXInkscapeLayerFilter.java b/blocks/inkscape/src/main/java/org/kabeja/inkscape/xml/SAXInkscapeLayerFilter.java
similarity index 100%
rename from blocks/inkscape/src/org/kabeja/inkscape/xml/SAXInkscapeLayerFilter.java
rename to blocks/inkscape/src/main/java/org/kabeja/inkscape/xml/SAXInkscapeLayerFilter.java
diff --git a/blocks/inkscape/conf/kabeja-java.inx b/blocks/inkscape/src/main/resources/conf/kabeja-java.inx
similarity index 100%
rename from blocks/inkscape/conf/kabeja-java.inx
rename to blocks/inkscape/src/main/resources/conf/kabeja-java.inx
diff --git a/blocks/inkscape/conf/kabeja-mono.inx b/blocks/inkscape/src/main/resources/conf/kabeja-mono.inx
similarity index 100%
rename from blocks/inkscape/conf/kabeja-mono.inx
rename to blocks/inkscape/src/main/resources/conf/kabeja-mono.inx
diff --git a/blocks/inkscape/conf/kabeja-mono.sh b/blocks/inkscape/src/main/resources/conf/kabeja-mono.sh
similarity index 100%
rename from blocks/inkscape/conf/kabeja-mono.sh
rename to blocks/inkscape/src/main/resources/conf/kabeja-mono.sh
diff --git a/blocks/inkscape/conf/kabeja-native.inx b/blocks/inkscape/src/main/resources/conf/kabeja-native.inx
similarity index 100%
rename from blocks/inkscape/conf/kabeja-native.inx
rename to blocks/inkscape/src/main/resources/conf/kabeja-native.inx
diff --git a/blocks/inkscape/conf/kabeja.bat b/blocks/inkscape/src/main/resources/conf/kabeja.bat
similarity index 100%
rename from blocks/inkscape/conf/kabeja.bat
rename to blocks/inkscape/src/main/resources/conf/kabeja.bat
diff --git a/blocks/inkscape/conf/kabeja.sh b/blocks/inkscape/src/main/resources/conf/kabeja.sh
similarity index 100%
rename from blocks/inkscape/conf/kabeja.sh
rename to blocks/inkscape/src/main/resources/conf/kabeja.sh
diff --git a/blocks/inkscape/conf/process.xml b/blocks/inkscape/src/main/resources/conf/process.xml
similarity index 100%
rename from blocks/inkscape/conf/process.xml
rename to blocks/inkscape/src/main/resources/conf/process.xml
diff --git a/blocks/svg/build.xml b/blocks/svg/build.xml
deleted file mode 100755
index bc407f26..00000000
--- a/blocks/svg/build.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="dxf2svg" default="dist" basedir=".">
-	<property name="homepath" value="" />
-	<property name="block.releasename" value="kabeja-svg-${releaseversion}" />
-	<property name="src" value="src" />
-	<property name="sources" value="java" />
-	<property name="test" value="test" />
-	<property name="dist" value="dist" />
-	<property name="help" value="doc" />
-	<property name="icons" value="icons" />
-	<property name="lang" value="lang" />
-	<property name="conf" value="conf" />
-	<property name="block.libs" value="lib" />
-	<property name="sample" value="sample" />
-	<property name="block.manifest" value="manifestfile" />
-	<property name="version" value="0.4" />
-	<property name="packages" value="packages" />
-	<property name="samples" value="samples" />
-	<property name="apidocs" value="javadoc" />
-	<property name="docs" value="doc" />
-	<property name="JarClassPath" value="" />
-	<property name="tempdir" value="tmp" />
-	<property name="tools" value="tools" />
-	<property name="legal" value="legal"/>
-	<property name="block.mainclass" value="org.kabeja.ui.viewer.Main"/>
-	<property name="debug" value="on" />
-
-
-
-	<description>
-	</description>
-
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${classes}" />
-		<mkdir dir="${build}/${classes}/${icons}" />
-		<copy todir="${build}/${classes}/${icons}">
-			<fileset dir="${icons}">
-				<include name="**/*" />
-			</fileset>
-		</copy>
-		<mkdir dir="${dist}" />
-		<mkdir dir="${dist}/${help}" />
-		<mkdir dir="${dist}/${lang}" />
-		<mkdir dir="${dist}/${libs}" />
-		<mkdir dir="${dist}/${conf}" />
-		<mkdir dir="${packages}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${build}/${classes}" target="${java.target.version}" debug="${debug}" source="${java.target.version}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${block.libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${kabeja.home}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<dirset dir="${kabeja.home}/${build}/${classes}"/>
-
-			</classpath>
-		</javac>
-		<copy todir="${build}/${classes}">
-			<fileset dir="${src}">
-				<include name="**/*.properties" />
-			</fileset>
-		</copy>
-	</target>
-
-
-
-
-	<target name="dist" depends="compile, manifest">
-		<copy todir="${kabeja.home}/${dist}/${libs}">
-			<fileset dir="${libs}">
-				<include name="**/*" />
-			</fileset>
-		</copy>
-		<!-- the libraries licenses -->
-		<mkdir dir="${kabeja.home}/${dist}/${legal}"/>
-		<copy todir="${kabeja.home}/${dist}/${legal}">
-			<fileset dir="${legal}">
-						<include name="**/*" />
-			</fileset>
-		</copy>
-
-		<jar jarfile="${kabeja.home}/${dist}/${libs}/${block.releasename}.jar" basedir="${build}/${classes}" includes="**/*" manifest="${block.manifest}"/>
-	</target>
-
-
-
-
-
-
-
-
-
-	<target name="clean">
-		<delete dir="${build}" />
-		<delete dir="${dist}" />
-       <delete file="${block.manifest}"/>
-		<delete dir="${tempdir}" />
-	</target>
-
-	<target name="javadoc">
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${apidocs}" />
-		<javadoc packagenames="*.*.*" sourcepath="${src}/${sources}" destdir="${build}/${apidocs}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement path="${build}/${sources}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-	<!-- unit test section -->
-	<target name="test-init" depends="init">
-		<mkdir dir="${build}/${test}" />
-	</target>
-	<target name="test-build" depends="test-init">
-		<javac srcdir="${src}/${test}" destdir="${build}/${test}">
-			<classpath>
-				<pathelement path="{$classpath}" />
-				<pathelement path="${build}/${sources}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${tools}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile,test-build">
-		<java classname="junit.swingui.TestRunner" fork="yes">
-			<arg value="" />
-			<classpath>
-				<pathelement path="{$classpath}" />
-				<pathelement path="${build}/${sources}" />
-				<pathelement path="${build}/${test}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${tools}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-	</target>
-
-	<!-- new manifest section here -->
-	<target name="manifest">
-		<fileset dir="${block.libs}" id="jar.files">
-			<include name="*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="block.jars" refid="jar.files">
-			<map from="${basedir}${file.separator}${block.libs}${file.separator}" to="" />
-		</pathconvert>
-		<fileset dir="${kabeja.home}/${dist}/${libs}" id="core-jar.files">
-				<include name="*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="core.jars" refid="core-jar.files">
-				<map from="${kabeja.home}${file.separator}${dist}${file.separator}${libs}${file.separator}" to="" />
-		</pathconvert>
-		<manifest file="${block.manifest}">
-			<attribute name="Main-Class" value="${block.mainclass}" />
-			<attribute name="Class-Path" value="${block.jars} ${core.jars} " />
-		</manifest>
-	</target>
-
-
-
-</project>
-
diff --git a/blocks/svg/lib/batik-all.jar b/blocks/svg/lib/batik-all.jar
deleted file mode 100755
index dd9588be..00000000
Binary files a/blocks/svg/lib/batik-all.jar and /dev/null differ
diff --git a/blocks/svg/lib/js.jar b/blocks/svg/lib/js.jar
deleted file mode 100755
index 2b926505..00000000
Binary files a/blocks/svg/lib/js.jar and /dev/null differ
diff --git a/blocks/svg/lib/miethxml-toolkit.jar b/blocks/svg/lib/miethxml-toolkit.jar
deleted file mode 100755
index 337ad869..00000000
Binary files a/blocks/svg/lib/miethxml-toolkit.jar and /dev/null differ
diff --git a/blocks/svg/lib/pdf-transcoder.jar b/blocks/svg/lib/pdf-transcoder.jar
deleted file mode 100644
index 1a8666eb..00000000
Binary files a/blocks/svg/lib/pdf-transcoder.jar and /dev/null differ
diff --git a/blocks/svg/lib/xml-apis-ext.jar b/blocks/svg/lib/xml-apis-ext.jar
deleted file mode 100644
index a7869d68..00000000
Binary files a/blocks/svg/lib/xml-apis-ext.jar and /dev/null differ
diff --git a/blocks/svg/lib/xml-apis.jar b/blocks/svg/lib/xml-apis.jar
deleted file mode 100644
index d42c0ea6..00000000
Binary files a/blocks/svg/lib/xml-apis.jar and /dev/null differ
diff --git a/blocks/svg/pom.xml b/blocks/svg/pom.xml
new file mode 100644
index 00000000..4c6c0894
--- /dev/null
+++ b/blocks/svg/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+    <artifactId>kabeja-svg</artifactId>
+    <name>Kabeja SVG module</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.kabeja</groupId>
+        <artifactId>kabeja</artifactId>
+        <version>0.4.2-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.kabeja.ui.viewer.Main</mainClass>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.kabeja</groupId>
+            <artifactId>kabeja-core</artifactId>
+            <version>0.4.2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-swing</artifactId>
+            <version>1.8pre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-transcoder</artifactId>
+            <version>1.8pre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-js</artifactId>
+            <version>1.8pre</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/blocks/svg/src/dk/abj/svg/action/CenterAction.java b/blocks/svg/src/main/java/dk/abj/svg/action/CenterAction.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/CenterAction.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/CenterAction.java
diff --git a/blocks/svg/src/dk/abj/svg/action/HighlightAction.java b/blocks/svg/src/main/java/dk/abj/svg/action/HighlightAction.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/HighlightAction.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/HighlightAction.java
diff --git a/blocks/svg/src/dk/abj/svg/action/LayerSelectionAction.java b/blocks/svg/src/main/java/dk/abj/svg/action/LayerSelectionAction.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/LayerSelectionAction.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/LayerSelectionAction.java
diff --git a/blocks/svg/src/dk/abj/svg/action/Messages.java b/blocks/svg/src/main/java/dk/abj/svg/action/Messages.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/Messages.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/Messages.java
diff --git a/blocks/svg/src/dk/abj/svg/action/PanActionInterceptor.java b/blocks/svg/src/main/java/dk/abj/svg/action/PanActionInterceptor.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/PanActionInterceptor.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/PanActionInterceptor.java
diff --git a/blocks/svg/src/dk/abj/svg/action/RotateActionInteractor.java b/blocks/svg/src/main/java/dk/abj/svg/action/RotateActionInteractor.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/RotateActionInteractor.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/RotateActionInteractor.java
diff --git a/blocks/svg/src/dk/abj/svg/action/ZoomImageActionInteractor.java b/blocks/svg/src/main/java/dk/abj/svg/action/ZoomImageActionInteractor.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/ZoomImageActionInteractor.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/ZoomImageActionInteractor.java
diff --git a/blocks/svg/src/dk/abj/svg/action/ZoomSelectionActionInterceptor.java b/blocks/svg/src/main/java/dk/abj/svg/action/ZoomSelectionActionInterceptor.java
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/ZoomSelectionActionInterceptor.java
rename to blocks/svg/src/main/java/dk/abj/svg/action/ZoomSelectionActionInterceptor.java
diff --git a/blocks/svg/src/dk/abj/svg/action/messages.properties b/blocks/svg/src/main/java/dk/abj/svg/action/messages.properties
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/messages.properties
rename to blocks/svg/src/main/java/dk/abj/svg/action/messages.properties
diff --git a/blocks/svg/src/dk/abj/svg/action/messages_da_DK.properties b/blocks/svg/src/main/java/dk/abj/svg/action/messages_da_DK.properties
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/messages_da_DK.properties
rename to blocks/svg/src/main/java/dk/abj/svg/action/messages_da_DK.properties
diff --git a/blocks/svg/src/dk/abj/svg/action/messages_de_DE.properties b/blocks/svg/src/main/java/dk/abj/svg/action/messages_de_DE.properties
similarity index 100%
rename from blocks/svg/src/dk/abj/svg/action/messages_de_DE.properties
rename to blocks/svg/src/main/java/dk/abj/svg/action/messages_de_DE.properties
diff --git a/blocks/svg/src/org/kabeja/batik/tools/AbstractSAXSerializer.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/AbstractSAXSerializer.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/AbstractSAXSerializer.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/AbstractSAXSerializer.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/AbstractSAXSerializer2.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/AbstractSAXSerializer2.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/AbstractSAXSerializer2.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/AbstractSAXSerializer2.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/FontImport.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/FontImport.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/FontImport.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/FontImport.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/ImageBase64Encoder.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/ImageBase64Encoder.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/ImageBase64Encoder.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/ImageBase64Encoder.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/SAXJPEGSerializer.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/SAXJPEGSerializer.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/SAXJPEGSerializer.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/SAXJPEGSerializer.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/SAXPDFSerializer.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/SAXPDFSerializer.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/SAXPDFSerializer.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/SAXPDFSerializer.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/SAXPNGSerializer.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/SAXPNGSerializer.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/SAXPNGSerializer.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/SAXPNGSerializer.java
diff --git a/blocks/svg/src/org/kabeja/batik/tools/SAXTIFFSerializer.java b/blocks/svg/src/main/java/org/kabeja/batik/tools/SAXTIFFSerializer.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/batik/tools/SAXTIFFSerializer.java
rename to blocks/svg/src/main/java/org/kabeja/batik/tools/SAXTIFFSerializer.java
diff --git a/blocks/svg/src/org/kabeja/processing/ScriptablePostProcessor.java b/blocks/svg/src/main/java/org/kabeja/processing/ScriptablePostProcessor.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/ScriptablePostProcessor.java
rename to blocks/svg/src/main/java/org/kabeja/processing/ScriptablePostProcessor.java
diff --git a/blocks/svg/src/org/kabeja/processing/scripting/ScriptEngine.java b/blocks/svg/src/main/java/org/kabeja/processing/scripting/ScriptEngine.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/scripting/ScriptEngine.java
rename to blocks/svg/src/main/java/org/kabeja/processing/scripting/ScriptEngine.java
diff --git a/blocks/svg/src/org/kabeja/processing/scripting/ScriptException.java b/blocks/svg/src/main/java/org/kabeja/processing/scripting/ScriptException.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/scripting/ScriptException.java
rename to blocks/svg/src/main/java/org/kabeja/processing/scripting/ScriptException.java
diff --git a/blocks/svg/src/org/kabeja/processing/scripting/impl/Global.java b/blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/Global.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/scripting/impl/Global.java
rename to blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/Global.java
diff --git a/blocks/svg/src/org/kabeja/processing/scripting/impl/JavaScriptEngine.java b/blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/JavaScriptEngine.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/scripting/impl/JavaScriptEngine.java
rename to blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/JavaScriptEngine.java
diff --git a/blocks/svg/src/org/kabeja/processing/scripting/impl/JavaScriptShell.java b/blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/JavaScriptShell.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/processing/scripting/impl/JavaScriptShell.java
rename to blocks/svg/src/main/java/org/kabeja/processing/scripting/impl/JavaScriptShell.java
diff --git a/blocks/svg/src/org/kabeja/svg/DXF2SVGReader.java b/blocks/svg/src/main/java/org/kabeja/svg/DXF2SVGReader.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/DXF2SVGReader.java
rename to blocks/svg/src/main/java/org/kabeja/svg/DXF2SVGReader.java
diff --git a/blocks/svg/src/org/kabeja/svg/FixedStrokeWidthFilter.java b/blocks/svg/src/main/java/org/kabeja/svg/FixedStrokeWidthFilter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/FixedStrokeWidthFilter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/FixedStrokeWidthFilter.java
diff --git a/blocks/svg/src/org/kabeja/svg/RootLayerFilter.java b/blocks/svg/src/main/java/org/kabeja/svg/RootLayerFilter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/RootLayerFilter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/RootLayerFilter.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGConstants.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGConstants.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGConstants.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGConstants.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGContext.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGContext.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGContext.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGContext.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGFragmentGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGFragmentGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGFragmentGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGFragmentGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGGenerationException.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGGenerationException.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGGenerationException.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGGenerationException.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGGeneratorConfiguration.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGGeneratorConfiguration.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGGeneratorConfiguration.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGGeneratorConfiguration.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGPathBoundaryGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGPathBoundaryGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGPathBoundaryGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGPathBoundaryGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGSAXGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGSAXGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGSAXGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGSAXGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGSAXGeneratorManager.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGSAXGeneratorManager.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGSAXGeneratorManager.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGSAXGeneratorManager.java
diff --git a/blocks/svg/src/org/kabeja/svg/SVGUtils.java b/blocks/svg/src/main/java/org/kabeja/svg/SVGUtils.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/SVGUtils.java
rename to blocks/svg/src/main/java/org/kabeja/svg/SVGUtils.java
diff --git a/blocks/svg/src/org/kabeja/svg/StyleAttributeFilter.java b/blocks/svg/src/main/java/org/kabeja/svg/StyleAttributeFilter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/StyleAttributeFilter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/StyleAttributeFilter.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/CanvasUpdateManager.java b/blocks/svg/src/main/java/org/kabeja/svg/action/CanvasUpdateManager.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/CanvasUpdateManager.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/CanvasUpdateManager.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/CanvasUpdateRunnable.java b/blocks/svg/src/main/java/org/kabeja/svg/action/CanvasUpdateRunnable.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/CanvasUpdateRunnable.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/CanvasUpdateRunnable.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/CustomActionView.java b/blocks/svg/src/main/java/org/kabeja/svg/action/CustomActionView.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/CustomActionView.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/CustomActionView.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/DXFDocumentAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/DXFDocumentAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/DXFDocumentAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/DXFDocumentAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/GroupAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/GroupAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/GroupAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/GroupAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/GroupActionUnSelector.java b/blocks/svg/src/main/java/org/kabeja/svg/action/GroupActionUnSelector.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/GroupActionUnSelector.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/GroupActionUnSelector.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/JSVGCanvasAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/JSVGCanvasAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/JSVGCanvasAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/JSVGCanvasAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/LayoutSwitchAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/LayoutSwitchAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/LayoutSwitchAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/LayoutSwitchAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/Messages.java b/blocks/svg/src/main/java/org/kabeja/svg/action/Messages.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/Messages.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/Messages.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/PrintAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/PrintAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/PrintAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/PrintAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/SVGDocumentAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/SVGDocumentAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/SVGDocumentAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/SVGDocumentAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/SelectionAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/SelectionAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/SelectionAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/SelectionAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/ToggleInteractorActionAdapter.java b/blocks/svg/src/main/java/org/kabeja/svg/action/ToggleInteractorActionAdapter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/ToggleInteractorActionAdapter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/ToggleInteractorActionAdapter.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/ViewerAction.java b/blocks/svg/src/main/java/org/kabeja/svg/action/ViewerAction.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/ViewerAction.java
rename to blocks/svg/src/main/java/org/kabeja/svg/action/ViewerAction.java
diff --git a/blocks/svg/src/org/kabeja/svg/action/messages.properties b/blocks/svg/src/main/java/org/kabeja/svg/action/messages.properties
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/messages.properties
rename to blocks/svg/src/main/java/org/kabeja/svg/action/messages.properties
diff --git a/blocks/svg/src/org/kabeja/svg/action/messages_da_DK.properties b/blocks/svg/src/main/java/org/kabeja/svg/action/messages_da_DK.properties
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/messages_da_DK.properties
rename to blocks/svg/src/main/java/org/kabeja/svg/action/messages_da_DK.properties
diff --git a/blocks/svg/src/org/kabeja/svg/action/messages_de_DE.properties b/blocks/svg/src/main/java/org/kabeja/svg/action/messages_de_DE.properties
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/action/messages_de_DE.properties
rename to blocks/svg/src/main/java/org/kabeja/svg/action/messages_de_DE.properties
diff --git a/blocks/svg/src/org/kabeja/svg/dimension/AbstractDimensionOutputter.java b/blocks/svg/src/main/java/org/kabeja/svg/dimension/AbstractDimensionOutputter.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/dimension/AbstractDimensionOutputter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/dimension/AbstractDimensionOutputter.java
diff --git a/blocks/svg/src/org/kabeja/svg/dimension/LinearDimensionOutputter.java b/blocks/svg/src/main/java/org/kabeja/svg/dimension/LinearDimensionOutputter.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/dimension/LinearDimensionOutputter.java
rename to blocks/svg/src/main/java/org/kabeja/svg/dimension/LinearDimensionOutputter.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/AbstractSVGSAXGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/AbstractSVGSAXGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/AbstractSVGSAXGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/AbstractSVGSAXGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVG3DFaceGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVG3DFaceGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVG3DFaceGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVG3DFaceGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVG3DSolidGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVG3DSolidGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVG3DSolidGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVG3DSolidGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGArcGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGArcGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGArcGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGArcGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGAttribDefinitionGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGAttribDefinitionGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGAttribDefinitionGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGAttribDefinitionGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGAttribGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGAttribGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGAttribGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGAttribGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGBodyGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGBodyGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGBodyGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGBodyGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGCircleGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGCircleGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGCircleGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGCircleGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGDimensionGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGDimensionGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGDimensionGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGDimensionGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGEllipseGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGEllipseGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGEllipseGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGEllipseGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGHatchGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGHatchGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGHatchGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGHatchGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGImageGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGImageGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGImageGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGImageGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGInsertGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGInsertGenerator.java
similarity index 99%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGInsertGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGInsertGenerator.java
index 43e85739..ca8059bf 100644
--- a/blocks/svg/src/org/kabeja/svg/generators/SVGInsertGenerator.java
+++ b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGInsertGenerator.java
@@ -51,7 +51,7 @@ public void toSAX(ContentHandler handler, Map svgContext, DXFEntity entity,
 		int rows = insert.getRows();
 		int columns = insert.getColumns();
 		double rotate = insert.getRotate();
-		Point insertPoint = insert.getPoint();
+		Point insertPoint = insert.getInsertPoint();
 		double scale_x = insert.getScaleX();
 		double scale_y = insert.getScaleY();
 		double column_spacing = insert.getColumnSpacing();
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGLWPolylineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLWPolylineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGLWPolylineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLWPolylineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGLeaderGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLeaderGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGLeaderGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLeaderGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGLineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGLineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGLineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGMLineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGMLineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGMLineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGMLineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGMTextGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGMTextGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGMTextGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGMTextGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGPointGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGPointGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGPointGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGPointGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGPolylineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGPolylineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGPolylineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGPolylineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGRayGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGRayGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGRayGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGRayGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGShapeGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGShapeGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGShapeGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGShapeGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGSolidGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGSolidGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGSolidGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGSolidGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGSplineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGSplineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGSplineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGSplineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGStyleGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGStyleGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGStyleGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGStyleGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGTextGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGTextGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGTextGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGTextGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGToleranceGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGToleranceGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGToleranceGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGToleranceGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGTraceGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGTraceGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGTraceGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGTraceGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGViewportGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGViewportGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGViewportGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGViewportGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/generators/SVGXLineGenerator.java b/blocks/svg/src/main/java/org/kabeja/svg/generators/SVGXLineGenerator.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/generators/SVGXLineGenerator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/generators/SVGXLineGenerator.java
diff --git a/blocks/svg/src/org/kabeja/svg/tools/DXFSAXDocumentFactory.java b/blocks/svg/src/main/java/org/kabeja/svg/tools/DXFSAXDocumentFactory.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/tools/DXFSAXDocumentFactory.java
rename to blocks/svg/src/main/java/org/kabeja/svg/tools/DXFSAXDocumentFactory.java
diff --git a/blocks/svg/src/org/kabeja/svg/tools/LayerSeparator.java b/blocks/svg/src/main/java/org/kabeja/svg/tools/LayerSeparator.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/tools/LayerSeparator.java
rename to blocks/svg/src/main/java/org/kabeja/svg/tools/LayerSeparator.java
diff --git a/blocks/svg/src/org/kabeja/svg/ui/OutputSettingsUI.java b/blocks/svg/src/main/java/org/kabeja/svg/ui/OutputSettingsUI.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/ui/OutputSettingsUI.java
rename to blocks/svg/src/main/java/org/kabeja/svg/ui/OutputSettingsUI.java
diff --git a/blocks/svg/src/org/kabeja/svg/ui/PopUpButton.java b/blocks/svg/src/main/java/org/kabeja/svg/ui/PopUpButton.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/ui/PopUpButton.java
rename to blocks/svg/src/main/java/org/kabeja/svg/ui/PopUpButton.java
diff --git a/blocks/svg/src/org/kabeja/svg/ui/SVGViewUIComponent.java b/blocks/svg/src/main/java/org/kabeja/svg/ui/SVGViewUIComponent.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/svg/ui/SVGViewUIComponent.java
rename to blocks/svg/src/main/java/org/kabeja/svg/ui/SVGViewUIComponent.java
diff --git a/blocks/svg/src/org/kabeja/ui/Demo.java b/blocks/svg/src/main/java/org/kabeja/ui/Demo.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/Demo.java
rename to blocks/svg/src/main/java/org/kabeja/ui/Demo.java
diff --git a/blocks/svg/src/org/kabeja/ui/JToggleButtonGroup.java b/blocks/svg/src/main/java/org/kabeja/ui/JToggleButtonGroup.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/JToggleButtonGroup.java
rename to blocks/svg/src/main/java/org/kabeja/ui/JToggleButtonGroup.java
diff --git a/blocks/svg/src/org/kabeja/ui/model/adapter/DefaultLeafAdapter.java b/blocks/svg/src/main/java/org/kabeja/ui/model/adapter/DefaultLeafAdapter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/model/adapter/DefaultLeafAdapter.java
rename to blocks/svg/src/main/java/org/kabeja/ui/model/adapter/DefaultLeafAdapter.java
diff --git a/blocks/svg/src/org/kabeja/ui/model/adapter/ProcessPipelinesAdapter.java b/blocks/svg/src/main/java/org/kabeja/ui/model/adapter/ProcessPipelinesAdapter.java
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/model/adapter/ProcessPipelinesAdapter.java
rename to blocks/svg/src/main/java/org/kabeja/ui/model/adapter/ProcessPipelinesAdapter.java
diff --git a/blocks/svg/src/org/kabeja/ui/viewer/Main.java b/blocks/svg/src/main/java/org/kabeja/ui/viewer/Main.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/viewer/Main.java
rename to blocks/svg/src/main/java/org/kabeja/ui/viewer/Main.java
diff --git a/blocks/svg/src/org/kabeja/ui/viewer/SVGViewer.java b/blocks/svg/src/main/java/org/kabeja/ui/viewer/SVGViewer.java
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/src/org/kabeja/ui/viewer/SVGViewer.java
rename to blocks/svg/src/main/java/org/kabeja/ui/viewer/SVGViewer.java
diff --git a/blocks/svg/conf/process.xml b/blocks/svg/src/main/resources/conf/process.xml
similarity index 100%
rename from blocks/svg/conf/process.xml
rename to blocks/svg/src/main/resources/conf/process.xml
diff --git a/blocks/svg/conf/ui.xml b/blocks/svg/src/main/resources/conf/ui.xml
similarity index 100%
rename from blocks/svg/conf/ui.xml
rename to blocks/svg/src/main/resources/conf/ui.xml
diff --git a/blocks/svg/icons/copy_edit.gif b/blocks/svg/src/main/resources/icons/copy_edit.gif
similarity index 100%
rename from blocks/svg/icons/copy_edit.gif
rename to blocks/svg/src/main/resources/icons/copy_edit.gif
diff --git a/blocks/svg/icons/cut_edit.gif b/blocks/svg/src/main/resources/icons/cut_edit.gif
similarity index 100%
rename from blocks/svg/icons/cut_edit.gif
rename to blocks/svg/src/main/resources/icons/cut_edit.gif
diff --git a/blocks/svg/icons/highlight.png b/blocks/svg/src/main/resources/icons/highlight.png
similarity index 100%
rename from blocks/svg/icons/highlight.png
rename to blocks/svg/src/main/resources/icons/highlight.png
diff --git a/blocks/svg/icons/layer_select.gif b/blocks/svg/src/main/resources/icons/layer_select.gif
similarity index 100%
rename from blocks/svg/icons/layer_select.gif
rename to blocks/svg/src/main/resources/icons/layer_select.gif
diff --git a/blocks/svg/icons/layout_ms.png b/blocks/svg/src/main/resources/icons/layout_ms.png
similarity index 100%
rename from blocks/svg/icons/layout_ms.png
rename to blocks/svg/src/main/resources/icons/layout_ms.png
diff --git a/blocks/svg/icons/layout_ms_l.png b/blocks/svg/src/main/resources/icons/layout_ms_l.png
similarity index 100%
rename from blocks/svg/icons/layout_ms_l.png
rename to blocks/svg/src/main/resources/icons/layout_ms_l.png
diff --git a/blocks/svg/icons/layout_ps.png b/blocks/svg/src/main/resources/icons/layout_ps.png
similarity index 100%
rename from blocks/svg/icons/layout_ps.png
rename to blocks/svg/src/main/resources/icons/layout_ps.png
diff --git a/blocks/svg/icons/layout_ps_l.png b/blocks/svg/src/main/resources/icons/layout_ps_l.png
similarity index 100%
rename from blocks/svg/icons/layout_ps_l.png
rename to blocks/svg/src/main/resources/icons/layout_ps_l.png
diff --git a/blocks/svg/icons/paper_settings.gif b/blocks/svg/src/main/resources/icons/paper_settings.gif
similarity index 100%
rename from blocks/svg/icons/paper_settings.gif
rename to blocks/svg/src/main/resources/icons/paper_settings.gif
diff --git a/blocks/svg/icons/paste_edit.gif b/blocks/svg/src/main/resources/icons/paste_edit.gif
similarity index 100%
rename from blocks/svg/icons/paste_edit.gif
rename to blocks/svg/src/main/resources/icons/paste_edit.gif
diff --git a/blocks/svg/icons/print.gif b/blocks/svg/src/main/resources/icons/print.gif
similarity index 100%
rename from blocks/svg/icons/print.gif
rename to blocks/svg/src/main/resources/icons/print.gif
diff --git a/blocks/svg/icons/reload.gif b/blocks/svg/src/main/resources/icons/reload.gif
similarity index 100%
rename from blocks/svg/icons/reload.gif
rename to blocks/svg/src/main/resources/icons/reload.gif
diff --git a/blocks/svg/icons/zoom1.png b/blocks/svg/src/main/resources/icons/zoom1.png
similarity index 100%
rename from blocks/svg/icons/zoom1.png
rename to blocks/svg/src/main/resources/icons/zoom1.png
diff --git a/blocks/svg/icons/zoom3.png b/blocks/svg/src/main/resources/icons/zoom3.png
similarity index 100%
rename from blocks/svg/icons/zoom3.png
rename to blocks/svg/src/main/resources/icons/zoom3.png
diff --git a/blocks/svg/icons/zoom4.png b/blocks/svg/src/main/resources/icons/zoom4.png
similarity index 100%
rename from blocks/svg/icons/zoom4.png
rename to blocks/svg/src/main/resources/icons/zoom4.png
diff --git a/blocks/svg/icons/zoom5.png b/blocks/svg/src/main/resources/icons/zoom5.png
similarity index 100%
rename from blocks/svg/icons/zoom5.png
rename to blocks/svg/src/main/resources/icons/zoom5.png
diff --git a/blocks/svg/icons/zoom6.png b/blocks/svg/src/main/resources/icons/zoom6.png
similarity index 100%
rename from blocks/svg/icons/zoom6.png
rename to blocks/svg/src/main/resources/icons/zoom6.png
diff --git a/blocks/svg/legal/LICENSE.batik b/blocks/svg/src/main/resources/legal/LICENSE.batik
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/legal/LICENSE.batik
rename to blocks/svg/src/main/resources/legal/LICENSE.batik
diff --git a/blocks/svg/legal/LICENSE.js.txt b/blocks/svg/src/main/resources/legal/LICENSE.js.txt
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/legal/LICENSE.js.txt
rename to blocks/svg/src/main/resources/legal/LICENSE.js.txt
diff --git a/blocks/svg/legal/LICENSE.miethxml-toolkit.txt b/blocks/svg/src/main/resources/legal/LICENSE.miethxml-toolkit.txt
old mode 100755
new mode 100644
similarity index 100%
rename from blocks/svg/legal/LICENSE.miethxml-toolkit.txt
rename to blocks/svg/src/main/resources/legal/LICENSE.miethxml-toolkit.txt
diff --git a/blocks/svg/legal/LICENSE.pdf-transcoder.txt b/blocks/svg/src/main/resources/legal/LICENSE.pdf-transcoder.txt
similarity index 100%
rename from blocks/svg/legal/LICENSE.pdf-transcoder.txt
rename to blocks/svg/src/main/resources/legal/LICENSE.pdf-transcoder.txt
diff --git a/blocks/xslt/build.xml b/blocks/xslt/build.xml
deleted file mode 100755
index c323c128..00000000
--- a/blocks/xslt/build.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="dxf2svg" default="dist" basedir=".">
-	<property name="homepath" value="" />
-	<property name="block.releasename" value="kabeja-xslt" />
-	<property name="releaseversion" value="0.1" />
-	<property name="src" value="src" />
-	<property name="sources" value="java" />
-	<property name="test" value="test" />
-	<property name="dist" value="dist" />
-	<property name="help" value="doc" />
-	<property name="icons" value="icons" />
-	<property name="lang" value="lang" />
-	<property name="conf" value="conf" />
-	<property name="block.libs" value="lib" />
-	<property name="sample" value="sample" />
-	<property name="block.manifest" value="manifestfile" />
-	<property name="version" value="0.1" />
-	<property name="packages" value="packages" />
-	<property name="samples" value="samples" />
-	<property name="apidocs" value="javadoc" />
-	<property name="docs" value="doc" />
-	<property name="JarClassPath" value="" />
-	<property name="tempdir" value="tmp" />
-	<property name="tools" value="tools" />
-	<property name="block.mainclass" value=""/>
-
-
-
-
-	<description>
-	</description>
-
-
-	<target name="init">
-		<tstamp />
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${classes}" />
-		<mkdir dir="${dist}" />
-		<mkdir dir="${dist}/${help}" />
-		<mkdir dir="${dist}/${lang}" />
-		<mkdir dir="${dist}/${libs}" />
-		<mkdir dir="${dist}/${conf}" />
-		
-	</target>
-
-	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${build}/${classes}" target="${java.target.version}" source="${java.target.version}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${block.libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<dirset dir="${kabeja.home}/${build}/${classes}"/>
-
-			</classpath>
-		</javac>
-	</target>
-
-
-
-
-	<target name="dist" depends="compile, manifest">
-		<copy todir="${kabeja.home}/${dist}/${libs}">
-			<fileset dir="${libs}">
-				<include name="**/*" />
-			</fileset>
-		</copy>
-		<jar jarfile="${kabeja.home}/${dist}/${libs}/${block.releasename}.jar" basedir="${build}/${classes}" includes="**/*" manifest="${block.manifest}"/>
-	</target>
-
-
-
-
-
-
-
-
-
-	<target name="clean">
-		<delete dir="${build}" />
-		<delete dir="${dist}" />
-
-		<delete dir="${tempdir}" />
-	</target>
-
-	<target name="javadoc">
-		<mkdir dir="${build}" />
-		<mkdir dir="${build}/${apidocs}" />
-		<javadoc packagenames="*.*.*" sourcepath="${src}/${sources}" destdir="${build}/${apidocs}">
-			<classpath>
-				<pathelement path="${classpath}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement path="${build}/${sources}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-	<!-- unit test section -->
-	<target name="test-init" depends="init">
-		<mkdir dir="${build}/${test}" />
-	</target>
-	<target name="test-build" depends="test-init">
-		<javac srcdir="${src}/${test}" destdir="${build}/${test}">
-			<classpath>
-				<pathelement path="{$classpath}" />
-				<pathelement path="${build}/${sources}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${tools}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile,test-build">
-		<java classname="junit.swingui.TestRunner" fork="yes">
-			<arg value="" />
-			<classpath>
-				<pathelement path="{$classpath}" />
-				<pathelement path="${build}/${sources}" />
-				<pathelement path="${build}/${test}" />
-				<fileset dir="${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${tools}/${libs}">
-					<include name="**/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-	</target>
-
-	<!-- new manifest section here -->
-	<target name="manifest">
-		<fileset dir="${block.libs}" id="jar.files">
-			<include name="*.jar" />
-		</fileset>
-		<pathconvert pathsep=" " property="block.jars" refid="jar.files">
-			<map from="${basedir}/" to="" />
-		</pathconvert>
-		<manifest file="${block.manifest}">
-			<attribute name="Main-Class" value="${block.mainclass}" />
-			<attribute name="Class-Path" value="${block.jars} ${releasename}.jar" />
-		</manifest>
-	</target>
-
-
-
-</project>
-
diff --git a/blocks/xslt/lib/nothing b/blocks/xslt/lib/nothing
deleted file mode 100644
index e69de29b..00000000
diff --git a/blocks/xslt/pom.xml b/blocks/xslt/pom.xml
new file mode 100644
index 00000000..869238cf
--- /dev/null
+++ b/blocks/xslt/pom.xml
@@ -0,0 +1,25 @@
+<?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>
+    <artifactId>kabeja-xslt</artifactId>
+    <name>Kabeja XSLT module</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.kabeja</groupId>
+        <artifactId>kabeja</artifactId>
+        <version>0.4.2-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.kabeja</groupId>
+            <artifactId>kabeja-core</artifactId>
+            <version>0.4.2-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/blocks/xslt/src/org/kabeja/xslt/SAXXMLSerializer.java b/blocks/xslt/src/main/java/org/kabeja/xslt/SAXXMLSerializer.java
similarity index 100%
rename from blocks/xslt/src/org/kabeja/xslt/SAXXMLSerializer.java
rename to blocks/xslt/src/main/java/org/kabeja/xslt/SAXXMLSerializer.java
diff --git a/blocks/xslt/src/org/kabeja/xslt/SAXXSLTFilter.java b/blocks/xslt/src/main/java/org/kabeja/xslt/SAXXSLTFilter.java
similarity index 100%
rename from blocks/xslt/src/org/kabeja/xslt/SAXXSLTFilter.java
rename to blocks/xslt/src/main/java/org/kabeja/xslt/SAXXSLTFilter.java
diff --git a/blocks/xslt/conf/process.xml b/blocks/xslt/src/main/resources/conf/process.xml
similarity index 100%
rename from blocks/xslt/conf/process.xml
rename to blocks/xslt/src/main/resources/conf/process.xml
diff --git a/build.xml b/build.xml
old mode 100755
new mode 100644
diff --git a/conf/parser.xml b/conf/parser.xml
old mode 100755
new mode 100644
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 00000000..42b90e44
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,44 @@
+<?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>
+    <artifactId>kabeja-core</artifactId>
+    <name>Kabeja core</name>
+    <description>Kabeja main library</description>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.kabeja</groupId>
+        <artifactId>kabeja</artifactId>
+        <version>0.4.2-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.kabeja.ui.Main</mainClass>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>de.miethxml</groupId>
+            <artifactId>miethxml-ui</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/java/org/kabeja/CLIApplication.java b/core/src/main/java/org/kabeja/CLIApplication.java
similarity index 100%
rename from src/java/org/kabeja/CLIApplication.java
rename to core/src/main/java/org/kabeja/CLIApplication.java
diff --git a/src/java/org/kabeja/Loader.java b/core/src/main/java/org/kabeja/Loader.java
similarity index 100%
rename from src/java/org/kabeja/Loader.java
rename to core/src/main/java/org/kabeja/Loader.java
diff --git a/src/java/org/kabeja/Main.java b/core/src/main/java/org/kabeja/Main.java
similarity index 100%
rename from src/java/org/kabeja/Main.java
rename to core/src/main/java/org/kabeja/Main.java
diff --git a/src/java/org/kabeja/dxf/Bounds.java b/core/src/main/java/org/kabeja/dxf/Bounds.java
similarity index 100%
rename from src/java/org/kabeja/dxf/Bounds.java
rename to core/src/main/java/org/kabeja/dxf/Bounds.java
diff --git a/src/java/org/kabeja/dxf/DXF3DFace.java b/core/src/main/java/org/kabeja/dxf/DXF3DFace.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXF3DFace.java
rename to core/src/main/java/org/kabeja/dxf/DXF3DFace.java
diff --git a/src/java/org/kabeja/dxf/DXF3DSolid.java b/core/src/main/java/org/kabeja/dxf/DXF3DSolid.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXF3DSolid.java
rename to core/src/main/java/org/kabeja/dxf/DXF3DSolid.java
diff --git a/src/java/org/kabeja/dxf/DXFArc.java b/core/src/main/java/org/kabeja/dxf/DXFArc.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFArc.java
rename to core/src/main/java/org/kabeja/dxf/DXFArc.java
diff --git a/src/java/org/kabeja/dxf/DXFAttrib.java b/core/src/main/java/org/kabeja/dxf/DXFAttrib.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFAttrib.java
rename to core/src/main/java/org/kabeja/dxf/DXFAttrib.java
diff --git a/src/java/org/kabeja/dxf/DXFAttribDefinition.java b/core/src/main/java/org/kabeja/dxf/DXFAttribDefinition.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFAttribDefinition.java
rename to core/src/main/java/org/kabeja/dxf/DXFAttribDefinition.java
diff --git a/src/java/org/kabeja/dxf/DXFBlock.java b/core/src/main/java/org/kabeja/dxf/DXFBlock.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFBlock.java
rename to core/src/main/java/org/kabeja/dxf/DXFBlock.java
diff --git a/src/java/org/kabeja/dxf/DXFBody.java b/core/src/main/java/org/kabeja/dxf/DXFBody.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFBody.java
rename to core/src/main/java/org/kabeja/dxf/DXFBody.java
diff --git a/src/java/org/kabeja/dxf/DXFCircle.java b/core/src/main/java/org/kabeja/dxf/DXFCircle.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFCircle.java
rename to core/src/main/java/org/kabeja/dxf/DXFCircle.java
diff --git a/src/java/org/kabeja/dxf/DXFColor.java b/core/src/main/java/org/kabeja/dxf/DXFColor.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFColor.java
rename to core/src/main/java/org/kabeja/dxf/DXFColor.java
diff --git a/src/java/org/kabeja/dxf/DXFConstants.java b/core/src/main/java/org/kabeja/dxf/DXFConstants.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFConstants.java
rename to core/src/main/java/org/kabeja/dxf/DXFConstants.java
diff --git a/src/java/org/kabeja/dxf/DXFDimension.java b/core/src/main/java/org/kabeja/dxf/DXFDimension.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFDimension.java
rename to core/src/main/java/org/kabeja/dxf/DXFDimension.java
diff --git a/src/java/org/kabeja/dxf/DXFDimensionStyle.java b/core/src/main/java/org/kabeja/dxf/DXFDimensionStyle.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFDimensionStyle.java
rename to core/src/main/java/org/kabeja/dxf/DXFDimensionStyle.java
diff --git a/src/java/org/kabeja/dxf/DXFDocument.java b/core/src/main/java/org/kabeja/dxf/DXFDocument.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFDocument.java
rename to core/src/main/java/org/kabeja/dxf/DXFDocument.java
diff --git a/src/java/org/kabeja/dxf/DXFEllipse.java b/core/src/main/java/org/kabeja/dxf/DXFEllipse.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFEllipse.java
rename to core/src/main/java/org/kabeja/dxf/DXFEllipse.java
diff --git a/src/java/org/kabeja/dxf/DXFEntity.java b/core/src/main/java/org/kabeja/dxf/DXFEntity.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFEntity.java
rename to core/src/main/java/org/kabeja/dxf/DXFEntity.java
diff --git a/src/java/org/kabeja/dxf/DXFExtrusion.java b/core/src/main/java/org/kabeja/dxf/DXFExtrusion.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFExtrusion.java
rename to core/src/main/java/org/kabeja/dxf/DXFExtrusion.java
diff --git a/src/java/org/kabeja/dxf/DXFHatch.java b/core/src/main/java/org/kabeja/dxf/DXFHatch.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFHatch.java
rename to core/src/main/java/org/kabeja/dxf/DXFHatch.java
diff --git a/src/java/org/kabeja/dxf/DXFHatchPattern.java b/core/src/main/java/org/kabeja/dxf/DXFHatchPattern.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFHatchPattern.java
rename to core/src/main/java/org/kabeja/dxf/DXFHatchPattern.java
diff --git a/src/java/org/kabeja/dxf/DXFHeader.java b/core/src/main/java/org/kabeja/dxf/DXFHeader.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFHeader.java
rename to core/src/main/java/org/kabeja/dxf/DXFHeader.java
diff --git a/src/java/org/kabeja/dxf/DXFImage.java b/core/src/main/java/org/kabeja/dxf/DXFImage.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFImage.java
rename to core/src/main/java/org/kabeja/dxf/DXFImage.java
diff --git a/src/java/org/kabeja/dxf/DXFInsert.java b/core/src/main/java/org/kabeja/dxf/DXFInsert.java
similarity index 96%
rename from src/java/org/kabeja/dxf/DXFInsert.java
rename to core/src/main/java/org/kabeja/dxf/DXFInsert.java
index bedc4618..29bd77d1 100755
--- a/src/java/org/kabeja/dxf/DXFInsert.java
+++ b/core/src/main/java/org/kabeja/dxf/DXFInsert.java
@@ -162,21 +162,9 @@ public void setColumns(int columns) {
         this.columns = columns;
     }
 
-    /**
-     * @return Returns the p.
-     * @deprecated @see getInsertPoint
-     */
-    public Point getPoint() {
-        return insertPoint;
-    }
 
-    /**
-     * @param p
-     *    @deprecated @see setInsertPoint
-     */
-    public void setPoint(Point p) {
-        this.insertPoint = p;
-    }
+
+
 
     /**
      * @return Returns the rotate.
diff --git a/src/java/org/kabeja/dxf/DXFLWPolyline.java b/core/src/main/java/org/kabeja/dxf/DXFLWPolyline.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFLWPolyline.java
rename to core/src/main/java/org/kabeja/dxf/DXFLWPolyline.java
diff --git a/src/java/org/kabeja/dxf/DXFLayer.java b/core/src/main/java/org/kabeja/dxf/DXFLayer.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFLayer.java
rename to core/src/main/java/org/kabeja/dxf/DXFLayer.java
diff --git a/src/java/org/kabeja/dxf/DXFLeader.java b/core/src/main/java/org/kabeja/dxf/DXFLeader.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFLeader.java
rename to core/src/main/java/org/kabeja/dxf/DXFLeader.java
diff --git a/src/java/org/kabeja/dxf/DXFLine.java b/core/src/main/java/org/kabeja/dxf/DXFLine.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFLine.java
rename to core/src/main/java/org/kabeja/dxf/DXFLine.java
diff --git a/src/java/org/kabeja/dxf/DXFLineType.java b/core/src/main/java/org/kabeja/dxf/DXFLineType.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFLineType.java
rename to core/src/main/java/org/kabeja/dxf/DXFLineType.java
diff --git a/src/java/org/kabeja/dxf/DXFMLine.java b/core/src/main/java/org/kabeja/dxf/DXFMLine.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFMLine.java
rename to core/src/main/java/org/kabeja/dxf/DXFMLine.java
diff --git a/src/java/org/kabeja/dxf/DXFMText.java b/core/src/main/java/org/kabeja/dxf/DXFMText.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFMText.java
rename to core/src/main/java/org/kabeja/dxf/DXFMText.java
diff --git a/src/java/org/kabeja/dxf/DXFPoint.java b/core/src/main/java/org/kabeja/dxf/DXFPoint.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFPoint.java
rename to core/src/main/java/org/kabeja/dxf/DXFPoint.java
diff --git a/src/java/org/kabeja/dxf/DXFPolyline.java b/core/src/main/java/org/kabeja/dxf/DXFPolyline.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFPolyline.java
rename to core/src/main/java/org/kabeja/dxf/DXFPolyline.java
diff --git a/src/java/org/kabeja/dxf/DXFRay.java b/core/src/main/java/org/kabeja/dxf/DXFRay.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFRay.java
rename to core/src/main/java/org/kabeja/dxf/DXFRay.java
diff --git a/src/java/org/kabeja/dxf/DXFRegion.java b/core/src/main/java/org/kabeja/dxf/DXFRegion.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFRegion.java
rename to core/src/main/java/org/kabeja/dxf/DXFRegion.java
diff --git a/src/java/org/kabeja/dxf/DXFShape.java b/core/src/main/java/org/kabeja/dxf/DXFShape.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFShape.java
rename to core/src/main/java/org/kabeja/dxf/DXFShape.java
diff --git a/src/java/org/kabeja/dxf/DXFSolid.java b/core/src/main/java/org/kabeja/dxf/DXFSolid.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFSolid.java
rename to core/src/main/java/org/kabeja/dxf/DXFSolid.java
diff --git a/src/java/org/kabeja/dxf/DXFSpline.java b/core/src/main/java/org/kabeja/dxf/DXFSpline.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFSpline.java
rename to core/src/main/java/org/kabeja/dxf/DXFSpline.java
diff --git a/src/java/org/kabeja/dxf/DXFStyle.java b/core/src/main/java/org/kabeja/dxf/DXFStyle.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFStyle.java
rename to core/src/main/java/org/kabeja/dxf/DXFStyle.java
diff --git a/src/java/org/kabeja/dxf/DXFText.java b/core/src/main/java/org/kabeja/dxf/DXFText.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFText.java
rename to core/src/main/java/org/kabeja/dxf/DXFText.java
diff --git a/src/java/org/kabeja/dxf/DXFTolerance.java b/core/src/main/java/org/kabeja/dxf/DXFTolerance.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFTolerance.java
rename to core/src/main/java/org/kabeja/dxf/DXFTolerance.java
diff --git a/src/java/org/kabeja/dxf/DXFTrace.java b/core/src/main/java/org/kabeja/dxf/DXFTrace.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFTrace.java
rename to core/src/main/java/org/kabeja/dxf/DXFTrace.java
diff --git a/src/java/org/kabeja/dxf/DXFVPort.java b/core/src/main/java/org/kabeja/dxf/DXFVPort.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFVPort.java
rename to core/src/main/java/org/kabeja/dxf/DXFVPort.java
diff --git a/src/java/org/kabeja/dxf/DXFVariable.java b/core/src/main/java/org/kabeja/dxf/DXFVariable.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFVariable.java
rename to core/src/main/java/org/kabeja/dxf/DXFVariable.java
diff --git a/src/java/org/kabeja/dxf/DXFVertex.java b/core/src/main/java/org/kabeja/dxf/DXFVertex.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFVertex.java
rename to core/src/main/java/org/kabeja/dxf/DXFVertex.java
diff --git a/src/java/org/kabeja/dxf/DXFView.java b/core/src/main/java/org/kabeja/dxf/DXFView.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFView.java
rename to core/src/main/java/org/kabeja/dxf/DXFView.java
diff --git a/src/java/org/kabeja/dxf/DXFViewport.java b/core/src/main/java/org/kabeja/dxf/DXFViewport.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFViewport.java
rename to core/src/main/java/org/kabeja/dxf/DXFViewport.java
diff --git a/src/java/org/kabeja/dxf/DXFXLine.java b/core/src/main/java/org/kabeja/dxf/DXFXLine.java
similarity index 100%
rename from src/java/org/kabeja/dxf/DXFXLine.java
rename to core/src/main/java/org/kabeja/dxf/DXFXLine.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFLayerComparator.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFLayerComparator.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFLayerComparator.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFLayerComparator.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFMLineSegment.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFMLineSegment.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFMLineSegment.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFMLineSegment.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFMLineSegmentElement.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFMLineSegmentElement.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFMLineSegmentElement.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFMLineSegmentElement.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFMLineStyleElementDistanceComparator.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFMLineStyleElementDistanceComparator.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFMLineStyleElementDistanceComparator.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFMLineStyleElementDistanceComparator.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFSplineConverter.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFSplineConverter.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFSplineConverter.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFSplineConverter.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFTextParser.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFTextParser.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFTextParser.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFTextParser.java
diff --git a/src/java/org/kabeja/dxf/helpers/DXFUtils.java b/core/src/main/java/org/kabeja/dxf/helpers/DXFUtils.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/DXFUtils.java
rename to core/src/main/java/org/kabeja/dxf/helpers/DXFUtils.java
diff --git a/src/java/org/kabeja/dxf/helpers/Edge.java b/core/src/main/java/org/kabeja/dxf/helpers/Edge.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/Edge.java
rename to core/src/main/java/org/kabeja/dxf/helpers/Edge.java
diff --git a/src/java/org/kabeja/dxf/helpers/HatchBoundaryLoop.java b/core/src/main/java/org/kabeja/dxf/helpers/HatchBoundaryLoop.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/HatchBoundaryLoop.java
rename to core/src/main/java/org/kabeja/dxf/helpers/HatchBoundaryLoop.java
diff --git a/src/java/org/kabeja/dxf/helpers/HatchLineFamily.java b/core/src/main/java/org/kabeja/dxf/helpers/HatchLineFamily.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/HatchLineFamily.java
rename to core/src/main/java/org/kabeja/dxf/helpers/HatchLineFamily.java
diff --git a/src/java/org/kabeja/dxf/helpers/HatchLineIterator.java b/core/src/main/java/org/kabeja/dxf/helpers/HatchLineIterator.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/HatchLineIterator.java
rename to core/src/main/java/org/kabeja/dxf/helpers/HatchLineIterator.java
diff --git a/src/java/org/kabeja/dxf/helpers/HatchLineSegment.java b/core/src/main/java/org/kabeja/dxf/helpers/HatchLineSegment.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/HatchLineSegment.java
rename to core/src/main/java/org/kabeja/dxf/helpers/HatchLineSegment.java
diff --git a/src/java/org/kabeja/dxf/helpers/HatchPattern.java b/core/src/main/java/org/kabeja/dxf/helpers/HatchPattern.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/HatchPattern.java
rename to core/src/main/java/org/kabeja/dxf/helpers/HatchPattern.java
diff --git a/src/java/org/kabeja/dxf/helpers/LineWidth.java b/core/src/main/java/org/kabeja/dxf/helpers/LineWidth.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/LineWidth.java
rename to core/src/main/java/org/kabeja/dxf/helpers/LineWidth.java
diff --git a/src/java/org/kabeja/dxf/helpers/MLineConverter.java b/core/src/main/java/org/kabeja/dxf/helpers/MLineConverter.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/MLineConverter.java
rename to core/src/main/java/org/kabeja/dxf/helpers/MLineConverter.java
diff --git a/src/java/org/kabeja/dxf/helpers/ParametricLine.java b/core/src/main/java/org/kabeja/dxf/helpers/ParametricLine.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/ParametricLine.java
rename to core/src/main/java/org/kabeja/dxf/helpers/ParametricLine.java
diff --git a/src/java/org/kabeja/dxf/helpers/Point.java b/core/src/main/java/org/kabeja/dxf/helpers/Point.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/Point.java
rename to core/src/main/java/org/kabeja/dxf/helpers/Point.java
diff --git a/src/java/org/kabeja/dxf/helpers/PolylineSegment.java b/core/src/main/java/org/kabeja/dxf/helpers/PolylineSegment.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/PolylineSegment.java
rename to core/src/main/java/org/kabeja/dxf/helpers/PolylineSegment.java
diff --git a/src/java/org/kabeja/dxf/helpers/SplinePoint.java b/core/src/main/java/org/kabeja/dxf/helpers/SplinePoint.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/SplinePoint.java
rename to core/src/main/java/org/kabeja/dxf/helpers/SplinePoint.java
diff --git a/src/java/org/kabeja/dxf/helpers/StyledTextParagraph.java b/core/src/main/java/org/kabeja/dxf/helpers/StyledTextParagraph.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/StyledTextParagraph.java
rename to core/src/main/java/org/kabeja/dxf/helpers/StyledTextParagraph.java
diff --git a/src/java/org/kabeja/dxf/helpers/TextDocument.java b/core/src/main/java/org/kabeja/dxf/helpers/TextDocument.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/TextDocument.java
rename to core/src/main/java/org/kabeja/dxf/helpers/TextDocument.java
diff --git a/src/java/org/kabeja/dxf/helpers/Vector.java b/core/src/main/java/org/kabeja/dxf/helpers/Vector.java
similarity index 100%
rename from src/java/org/kabeja/dxf/helpers/Vector.java
rename to core/src/main/java/org/kabeja/dxf/helpers/Vector.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFDictionary.java b/core/src/main/java/org/kabeja/dxf/objects/DXFDictionary.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFDictionary.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFDictionary.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFImageDefObject.java b/core/src/main/java/org/kabeja/dxf/objects/DXFImageDefObject.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFImageDefObject.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFImageDefObject.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFLayout.java b/core/src/main/java/org/kabeja/dxf/objects/DXFLayout.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFLayout.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFLayout.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFMLineStyle.java b/core/src/main/java/org/kabeja/dxf/objects/DXFMLineStyle.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFMLineStyle.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFMLineStyle.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFMLineStyleElement.java b/core/src/main/java/org/kabeja/dxf/objects/DXFMLineStyleElement.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFMLineStyleElement.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFMLineStyleElement.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFObject.java b/core/src/main/java/org/kabeja/dxf/objects/DXFObject.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFObject.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFObject.java
diff --git a/src/java/org/kabeja/dxf/objects/DXFPlotSettings.java b/core/src/main/java/org/kabeja/dxf/objects/DXFPlotSettings.java
similarity index 100%
rename from src/java/org/kabeja/dxf/objects/DXFPlotSettings.java
rename to core/src/main/java/org/kabeja/dxf/objects/DXFPlotSettings.java
diff --git a/src/java/org/kabeja/io/DXFGenerationException.java b/core/src/main/java/org/kabeja/io/DXFGenerationException.java
similarity index 100%
rename from src/java/org/kabeja/io/DXFGenerationException.java
rename to core/src/main/java/org/kabeja/io/DXFGenerationException.java
diff --git a/src/java/org/kabeja/io/StreamGenerator.java b/core/src/main/java/org/kabeja/io/StreamGenerator.java
similarity index 100%
rename from src/java/org/kabeja/io/StreamGenerator.java
rename to core/src/main/java/org/kabeja/io/StreamGenerator.java
diff --git a/src/java/org/kabeja/math/Edge.java b/core/src/main/java/org/kabeja/math/Edge.java
similarity index 100%
rename from src/java/org/kabeja/math/Edge.java
rename to core/src/main/java/org/kabeja/math/Edge.java
diff --git a/src/java/org/kabeja/math/GaussSolver.java b/core/src/main/java/org/kabeja/math/GaussSolver.java
similarity index 100%
rename from src/java/org/kabeja/math/GaussSolver.java
rename to core/src/main/java/org/kabeja/math/GaussSolver.java
diff --git a/src/java/org/kabeja/math/MathUtils.java b/core/src/main/java/org/kabeja/math/MathUtils.java
similarity index 100%
rename from src/java/org/kabeja/math/MathUtils.java
rename to core/src/main/java/org/kabeja/math/MathUtils.java
diff --git a/src/java/org/kabeja/math/NURBS.java b/core/src/main/java/org/kabeja/math/NURBS.java
similarity index 100%
rename from src/java/org/kabeja/math/NURBS.java
rename to core/src/main/java/org/kabeja/math/NURBS.java
diff --git a/src/java/org/kabeja/math/NURBSAutoStepPointIterator.java b/core/src/main/java/org/kabeja/math/NURBSAutoStepPointIterator.java
similarity index 100%
rename from src/java/org/kabeja/math/NURBSAutoStepPointIterator.java
rename to core/src/main/java/org/kabeja/math/NURBSAutoStepPointIterator.java
diff --git a/src/java/org/kabeja/math/NURBSFixedNTELSPointIterator.java b/core/src/main/java/org/kabeja/math/NURBSFixedNTELSPointIterator.java
similarity index 100%
rename from src/java/org/kabeja/math/NURBSFixedNTELSPointIterator.java
rename to core/src/main/java/org/kabeja/math/NURBSFixedNTELSPointIterator.java
diff --git a/src/java/org/kabeja/math/ParametricPlane.java b/core/src/main/java/org/kabeja/math/ParametricPlane.java
similarity index 100%
rename from src/java/org/kabeja/math/ParametricPlane.java
rename to core/src/main/java/org/kabeja/math/ParametricPlane.java
diff --git a/src/java/org/kabeja/math/Point.java b/core/src/main/java/org/kabeja/math/Point.java
similarity index 100%
rename from src/java/org/kabeja/math/Point.java
rename to core/src/main/java/org/kabeja/math/Point.java
diff --git a/src/java/org/kabeja/math/Solver.java b/core/src/main/java/org/kabeja/math/Solver.java
similarity index 100%
rename from src/java/org/kabeja/math/Solver.java
rename to core/src/main/java/org/kabeja/math/Solver.java
diff --git a/src/java/org/kabeja/math/TransformContext.java b/core/src/main/java/org/kabeja/math/TransformContext.java
similarity index 100%
rename from src/java/org/kabeja/math/TransformContext.java
rename to core/src/main/java/org/kabeja/math/TransformContext.java
diff --git a/src/java/org/kabeja/math/Vector.java b/core/src/main/java/org/kabeja/math/Vector.java
similarity index 100%
rename from src/java/org/kabeja/math/Vector.java
rename to core/src/main/java/org/kabeja/math/Vector.java
diff --git a/src/java/org/kabeja/parser/AbstractSectionHandler.java b/core/src/main/java/org/kabeja/parser/AbstractSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/AbstractSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/AbstractSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFBlocksSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFBlocksSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFBlocksSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFBlocksSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFEntitiesSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFEntitiesSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFEntitiesSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFEntitiesSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFHeaderSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFHeaderSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFHeaderSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFHeaderSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFObjectsSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFObjectsSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFObjectsSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFObjectsSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFParser.java b/core/src/main/java/org/kabeja/parser/DXFParser.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFParser.java
rename to core/src/main/java/org/kabeja/parser/DXFParser.java
diff --git a/src/java/org/kabeja/parser/DXFSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFTableSectionHandler.java b/core/src/main/java/org/kabeja/parser/DXFTableSectionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFTableSectionHandler.java
rename to core/src/main/java/org/kabeja/parser/DXFTableSectionHandler.java
diff --git a/src/java/org/kabeja/parser/DXFValue.java b/core/src/main/java/org/kabeja/parser/DXFValue.java
similarity index 100%
rename from src/java/org/kabeja/parser/DXFValue.java
rename to core/src/main/java/org/kabeja/parser/DXFValue.java
diff --git a/src/java/org/kabeja/parser/Handler.java b/core/src/main/java/org/kabeja/parser/Handler.java
similarity index 100%
rename from src/java/org/kabeja/parser/Handler.java
rename to core/src/main/java/org/kabeja/parser/Handler.java
diff --git a/src/java/org/kabeja/parser/HandlerManager.java b/core/src/main/java/org/kabeja/parser/HandlerManager.java
similarity index 100%
rename from src/java/org/kabeja/parser/HandlerManager.java
rename to core/src/main/java/org/kabeja/parser/HandlerManager.java
diff --git a/src/java/org/kabeja/parser/ParseException.java b/core/src/main/java/org/kabeja/parser/ParseException.java
similarity index 100%
rename from src/java/org/kabeja/parser/ParseException.java
rename to core/src/main/java/org/kabeja/parser/ParseException.java
diff --git a/src/java/org/kabeja/parser/Parser.java b/core/src/main/java/org/kabeja/parser/Parser.java
similarity index 100%
rename from src/java/org/kabeja/parser/Parser.java
rename to core/src/main/java/org/kabeja/parser/Parser.java
diff --git a/src/java/org/kabeja/parser/ParserBuilder.java b/core/src/main/java/org/kabeja/parser/ParserBuilder.java
similarity index 100%
rename from src/java/org/kabeja/parser/ParserBuilder.java
rename to core/src/main/java/org/kabeja/parser/ParserBuilder.java
diff --git a/src/java/org/kabeja/parser/ParserFactory.java b/core/src/main/java/org/kabeja/parser/ParserFactory.java
similarity index 100%
rename from src/java/org/kabeja/parser/ParserFactory.java
rename to core/src/main/java/org/kabeja/parser/ParserFactory.java
diff --git a/src/java/org/kabeja/parser/SAXParserBuilder.java b/core/src/main/java/org/kabeja/parser/SAXParserBuilder.java
similarity index 100%
rename from src/java/org/kabeja/parser/SAXParserBuilder.java
rename to core/src/main/java/org/kabeja/parser/SAXParserBuilder.java
diff --git a/src/java/org/kabeja/parser/dxf/DXFHandler.java b/core/src/main/java/org/kabeja/parser/dxf/DXFHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/DXFHandler.java
rename to core/src/main/java/org/kabeja/parser/dxf/DXFHandler.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/AbstractDXFStreamFilter.java b/core/src/main/java/org/kabeja/parser/dxf/filter/AbstractDXFStreamFilter.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/AbstractDXFStreamFilter.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/AbstractDXFStreamFilter.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/DXFStreamEntityFilter.java b/core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamEntityFilter.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/DXFStreamEntityFilter.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamEntityFilter.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/DXFStreamFilter.java b/core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamFilter.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/DXFStreamFilter.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamFilter.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/DXFStreamLayerFilter.java b/core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamLayerFilter.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/DXFStreamLayerFilter.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamLayerFilter.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/DXFStreamSectionFilter.java b/core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamSectionFilter.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/DXFStreamSectionFilter.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/DXFStreamSectionFilter.java
diff --git a/src/java/org/kabeja/parser/dxf/filter/FilterExample.java b/core/src/main/java/org/kabeja/parser/dxf/filter/FilterExample.java
similarity index 100%
rename from src/java/org/kabeja/parser/dxf/filter/FilterExample.java
rename to core/src/main/java/org/kabeja/parser/dxf/filter/FilterExample.java
diff --git a/src/java/org/kabeja/parser/entities/AbstractEntityHandler.java b/core/src/main/java/org/kabeja/parser/entities/AbstractEntityHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/AbstractEntityHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/AbstractEntityHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXF3DFaceHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXF3DFaceHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXF3DFaceHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXF3DFaceHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXF3DSolidHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXF3DSolidHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXF3DSolidHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXF3DSolidHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFArcHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFArcHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFArcHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFArcHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFAttribDefinitionHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFAttribDefinitionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFAttribDefinitionHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFAttribDefinitionHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFAttribHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFAttribHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFAttribHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFAttribHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFBodyHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFBodyHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFBodyHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFBodyHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFCircleHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFCircleHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFCircleHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFCircleHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFDimensionHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFDimensionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFDimensionHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFDimensionHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFEllipseHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFEllipseHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFEllipseHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFEllipseHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFEntityHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFEntityHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFEntityHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFEntityHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFHatchHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFHatchHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFHatchHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFHatchHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFImageHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFImageHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFImageHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFImageHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFInsertHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFInsertHandler.java
similarity index 96%
rename from src/java/org/kabeja/parser/entities/DXFInsertHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFInsertHandler.java
index 1c66c111..bc5c142a 100755
--- a/src/java/org/kabeja/parser/entities/DXFInsertHandler.java
+++ b/core/src/main/java/org/kabeja/parser/entities/DXFInsertHandler.java
@@ -107,17 +107,17 @@ public void parseGroup(int groupCode, DXFValue value) {
 		switch (groupCode) {
 
 		case GROUPCODE_START_X:
-			insert.getPoint().setX(value.getDoubleValue());
+			insert.getInsertPoint().setX(value.getDoubleValue());
 
 			break;
 
 		case GROUPCODE_START_Y:
-			insert.getPoint().setY(value.getDoubleValue());
+			insert.getInsertPoint().setY(value.getDoubleValue());
 
 			break;
 
 		case GROUPCODE_START_Z:
-			insert.getPoint().setZ(value.getDoubleValue());
+			insert.getInsertPoint().setZ(value.getDoubleValue());
 
 			break;
 
diff --git a/src/java/org/kabeja/parser/entities/DXFLWPolylineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFLWPolylineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFLWPolylineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFLWPolylineHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFLeaderHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFLeaderHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFLeaderHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFLeaderHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFLineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFLineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFLineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFLineHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFMLineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFMLineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFMLineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFMLineHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFMTextHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFMTextHandler.java
similarity index 99%
rename from src/java/org/kabeja/parser/entities/DXFMTextHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFMTextHandler.java
index 87f793ef..f800301f 100755
--- a/src/java/org/kabeja/parser/entities/DXFMTextHandler.java
+++ b/core/src/main/java/org/kabeja/parser/entities/DXFMTextHandler.java
@@ -85,7 +85,7 @@ public String getDXFEntityName() {
      * @see org.dxf2svg.parser.entities.EntityHandler#isFollowSequence()
      */
     public boolean isFollowSequence() {
-        // TODO Auto-generated method stub
+       
         return false;
     }
 
diff --git a/src/java/org/kabeja/parser/entities/DXFPointHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFPointHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFPointHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFPointHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFPolylineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFPolylineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFPolylineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFPolylineHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFRayHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFRayHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFRayHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFRayHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFRegionHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFRegionHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFRegionHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFRegionHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFShapeHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFShapeHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFShapeHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFShapeHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFSolidHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFSolidHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFSolidHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFSolidHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFSplineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFSplineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFSplineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFSplineHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFTextHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFTextHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFTextHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFTextHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFToleranceHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFToleranceHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFToleranceHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFToleranceHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFTraceHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFTraceHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFTraceHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFTraceHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFViewportHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFViewportHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFViewportHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFViewportHandler.java
diff --git a/src/java/org/kabeja/parser/entities/DXFXLineHandler.java b/core/src/main/java/org/kabeja/parser/entities/DXFXLineHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/entities/DXFXLineHandler.java
rename to core/src/main/java/org/kabeja/parser/entities/DXFXLineHandler.java
diff --git a/src/java/org/kabeja/parser/header/HeaderModes.java b/core/src/main/java/org/kabeja/parser/header/HeaderModes.java
similarity index 100%
rename from src/java/org/kabeja/parser/header/HeaderModes.java
rename to core/src/main/java/org/kabeja/parser/header/HeaderModes.java
diff --git a/src/java/org/kabeja/parser/objects/AbstractDXFObjectHandler.java b/core/src/main/java/org/kabeja/parser/objects/AbstractDXFObjectHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/AbstractDXFObjectHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/AbstractDXFObjectHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFDictionaryHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFDictionaryHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFDictionaryHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFDictionaryHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFImageDefHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFImageDefHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFImageDefHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFImageDefHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFLayoutHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFLayoutHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFLayoutHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFLayoutHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFMLineStyleHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFMLineStyleHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFMLineStyleHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFMLineStyleHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFObjectHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFObjectHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFObjectHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFObjectHandler.java
diff --git a/src/java/org/kabeja/parser/objects/DXFPlotsettingsHandler.java b/core/src/main/java/org/kabeja/parser/objects/DXFPlotsettingsHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/objects/DXFPlotsettingsHandler.java
rename to core/src/main/java/org/kabeja/parser/objects/DXFPlotsettingsHandler.java
diff --git a/src/java/org/kabeja/parser/table/AbstractTableHandler.java b/core/src/main/java/org/kabeja/parser/table/AbstractTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/AbstractTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/AbstractTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFDimensionStyleTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFDimensionStyleTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFDimensionStyleTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFDimensionStyleTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFLayerTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFLayerTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFLayerTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFLayerTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFLineTypeTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFLineTypeTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFLineTypeTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFLineTypeTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFStyleTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFStyleTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFStyleTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFStyleTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFVPortTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFVPortTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFVPortTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFVPortTableHandler.java
diff --git a/src/java/org/kabeja/parser/table/DXFViewTableHandler.java b/core/src/main/java/org/kabeja/parser/table/DXFViewTableHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/table/DXFViewTableHandler.java
rename to core/src/main/java/org/kabeja/parser/table/DXFViewTableHandler.java
diff --git a/src/java/org/kabeja/parser/util/DXFParsingValidator.java b/core/src/main/java/org/kabeja/parser/util/DXFParsingValidator.java
similarity index 100%
rename from src/java/org/kabeja/parser/util/DXFParsingValidator.java
rename to core/src/main/java/org/kabeja/parser/util/DXFParsingValidator.java
diff --git a/src/java/org/kabeja/parser/util/PointParser.java b/core/src/main/java/org/kabeja/parser/util/PointParser.java
similarity index 100%
rename from src/java/org/kabeja/parser/util/PointParser.java
rename to core/src/main/java/org/kabeja/parser/util/PointParser.java
diff --git a/src/java/org/kabeja/parser/xml/AbstractSAXParser.java b/core/src/main/java/org/kabeja/parser/xml/AbstractSAXParser.java
similarity index 100%
rename from src/java/org/kabeja/parser/xml/AbstractSAXParser.java
rename to core/src/main/java/org/kabeja/parser/xml/AbstractSAXParser.java
diff --git a/src/java/org/kabeja/parser/xml/AbstractXMLHandler.java b/core/src/main/java/org/kabeja/parser/xml/AbstractXMLHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/xml/AbstractXMLHandler.java
rename to core/src/main/java/org/kabeja/parser/xml/AbstractXMLHandler.java
diff --git a/src/java/org/kabeja/parser/xml/ParsingContext.java b/core/src/main/java/org/kabeja/parser/xml/ParsingContext.java
similarity index 100%
rename from src/java/org/kabeja/parser/xml/ParsingContext.java
rename to core/src/main/java/org/kabeja/parser/xml/ParsingContext.java
diff --git a/src/java/org/kabeja/parser/xml/XMLHandler.java b/core/src/main/java/org/kabeja/parser/xml/XMLHandler.java
similarity index 100%
rename from src/java/org/kabeja/parser/xml/XMLHandler.java
rename to core/src/main/java/org/kabeja/parser/xml/XMLHandler.java
diff --git a/src/java/org/kabeja/processing/AbstractConfigurable.java b/core/src/main/java/org/kabeja/processing/AbstractConfigurable.java
similarity index 100%
rename from src/java/org/kabeja/processing/AbstractConfigurable.java
rename to core/src/main/java/org/kabeja/processing/AbstractConfigurable.java
diff --git a/src/java/org/kabeja/processing/AbstractPostProcessor.java b/core/src/main/java/org/kabeja/processing/AbstractPostProcessor.java
similarity index 100%
rename from src/java/org/kabeja/processing/AbstractPostProcessor.java
rename to core/src/main/java/org/kabeja/processing/AbstractPostProcessor.java
diff --git a/src/java/org/kabeja/processing/BoundsDebugger.java b/core/src/main/java/org/kabeja/processing/BoundsDebugger.java
similarity index 100%
rename from src/java/org/kabeja/processing/BoundsDebugger.java
rename to core/src/main/java/org/kabeja/processing/BoundsDebugger.java
diff --git a/src/java/org/kabeja/processing/BoundsFilter.java b/core/src/main/java/org/kabeja/processing/BoundsFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/BoundsFilter.java
rename to core/src/main/java/org/kabeja/processing/BoundsFilter.java
diff --git a/src/java/org/kabeja/processing/Configurable.java b/core/src/main/java/org/kabeja/processing/Configurable.java
similarity index 100%
rename from src/java/org/kabeja/processing/Configurable.java
rename to core/src/main/java/org/kabeja/processing/Configurable.java
diff --git a/src/java/org/kabeja/processing/ImageFilter.java b/core/src/main/java/org/kabeja/processing/ImageFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/ImageFilter.java
rename to core/src/main/java/org/kabeja/processing/ImageFilter.java
diff --git a/src/java/org/kabeja/processing/LayerFilter.java b/core/src/main/java/org/kabeja/processing/LayerFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/LayerFilter.java
rename to core/src/main/java/org/kabeja/processing/LayerFilter.java
diff --git a/src/java/org/kabeja/processing/PolylineConverter.java b/core/src/main/java/org/kabeja/processing/PolylineConverter.java
similarity index 100%
rename from src/java/org/kabeja/processing/PolylineConverter.java
rename to core/src/main/java/org/kabeja/processing/PolylineConverter.java
diff --git a/src/java/org/kabeja/processing/PostProcessManager.java b/core/src/main/java/org/kabeja/processing/PostProcessManager.java
similarity index 100%
rename from src/java/org/kabeja/processing/PostProcessManager.java
rename to core/src/main/java/org/kabeja/processing/PostProcessManager.java
diff --git a/src/java/org/kabeja/processing/PostProcessor.java b/core/src/main/java/org/kabeja/processing/PostProcessor.java
similarity index 100%
rename from src/java/org/kabeja/processing/PostProcessor.java
rename to core/src/main/java/org/kabeja/processing/PostProcessor.java
diff --git a/src/java/org/kabeja/processing/PostProcessorConfig.java b/core/src/main/java/org/kabeja/processing/PostProcessorConfig.java
similarity index 100%
rename from src/java/org/kabeja/processing/PostProcessorConfig.java
rename to core/src/main/java/org/kabeja/processing/PostProcessorConfig.java
diff --git a/src/java/org/kabeja/processing/ProcessPipeline.java b/core/src/main/java/org/kabeja/processing/ProcessPipeline.java
similarity index 100%
rename from src/java/org/kabeja/processing/ProcessPipeline.java
rename to core/src/main/java/org/kabeja/processing/ProcessPipeline.java
diff --git a/src/java/org/kabeja/processing/ProcessingEventListener.java b/core/src/main/java/org/kabeja/processing/ProcessingEventListener.java
similarity index 100%
rename from src/java/org/kabeja/processing/ProcessingEventListener.java
rename to core/src/main/java/org/kabeja/processing/ProcessingEventListener.java
diff --git a/src/java/org/kabeja/processing/ProcessingEventProvider.java b/core/src/main/java/org/kabeja/processing/ProcessingEventProvider.java
similarity index 100%
rename from src/java/org/kabeja/processing/ProcessingEventProvider.java
rename to core/src/main/java/org/kabeja/processing/ProcessingEventProvider.java
diff --git a/src/java/org/kabeja/processing/ProcessingManager.java b/core/src/main/java/org/kabeja/processing/ProcessingManager.java
similarity index 100%
rename from src/java/org/kabeja/processing/ProcessingManager.java
rename to core/src/main/java/org/kabeja/processing/ProcessingManager.java
diff --git a/src/java/org/kabeja/processing/ProcessorException.java b/core/src/main/java/org/kabeja/processing/ProcessorException.java
similarity index 100%
rename from src/java/org/kabeja/processing/ProcessorException.java
rename to core/src/main/java/org/kabeja/processing/ProcessorException.java
diff --git a/src/java/org/kabeja/processing/ViewFilter.java b/core/src/main/java/org/kabeja/processing/ViewFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/ViewFilter.java
rename to core/src/main/java/org/kabeja/processing/ViewFilter.java
diff --git a/src/java/org/kabeja/processing/ViewportFilter.java b/core/src/main/java/org/kabeja/processing/ViewportFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/ViewportFilter.java
rename to core/src/main/java/org/kabeja/processing/ViewportFilter.java
diff --git a/src/java/org/kabeja/processing/VisibilityFilter.java b/core/src/main/java/org/kabeja/processing/VisibilityFilter.java
similarity index 100%
rename from src/java/org/kabeja/processing/VisibilityFilter.java
rename to core/src/main/java/org/kabeja/processing/VisibilityFilter.java
diff --git a/src/java/org/kabeja/processing/event/ProcessingEvent.java b/core/src/main/java/org/kabeja/processing/event/ProcessingEvent.java
similarity index 100%
rename from src/java/org/kabeja/processing/event/ProcessingEvent.java
rename to core/src/main/java/org/kabeja/processing/event/ProcessingEvent.java
diff --git a/src/java/org/kabeja/processing/event/ProcessingListener.java b/core/src/main/java/org/kabeja/processing/event/ProcessingListener.java
similarity index 100%
rename from src/java/org/kabeja/processing/event/ProcessingListener.java
rename to core/src/main/java/org/kabeja/processing/event/ProcessingListener.java
diff --git a/src/java/org/kabeja/processing/helper/MergeMap.java b/core/src/main/java/org/kabeja/processing/helper/MergeMap.java
similarity index 100%
rename from src/java/org/kabeja/processing/helper/MergeMap.java
rename to core/src/main/java/org/kabeja/processing/helper/MergeMap.java
diff --git a/src/java/org/kabeja/processing/helper/PolylineQueue.java b/core/src/main/java/org/kabeja/processing/helper/PolylineQueue.java
similarity index 100%
rename from src/java/org/kabeja/processing/helper/PolylineQueue.java
rename to core/src/main/java/org/kabeja/processing/helper/PolylineQueue.java
diff --git a/src/java/org/kabeja/tools/Application.java b/core/src/main/java/org/kabeja/tools/Application.java
similarity index 100%
rename from src/java/org/kabeja/tools/Application.java
rename to core/src/main/java/org/kabeja/tools/Application.java
diff --git a/src/java/org/kabeja/tools/CodePageParser.java b/core/src/main/java/org/kabeja/tools/CodePageParser.java
similarity index 100%
rename from src/java/org/kabeja/tools/CodePageParser.java
rename to core/src/main/java/org/kabeja/tools/CodePageParser.java
diff --git a/src/java/org/kabeja/tools/Component.java b/core/src/main/java/org/kabeja/tools/Component.java
similarity index 100%
rename from src/java/org/kabeja/tools/Component.java
rename to core/src/main/java/org/kabeja/tools/Component.java
diff --git a/src/java/org/kabeja/tools/ConfigHelper.java b/core/src/main/java/org/kabeja/tools/ConfigHelper.java
similarity index 100%
rename from src/java/org/kabeja/tools/ConfigHelper.java
rename to core/src/main/java/org/kabeja/tools/ConfigHelper.java
diff --git a/src/java/org/kabeja/tools/FontManager.java b/core/src/main/java/org/kabeja/tools/FontManager.java
similarity index 100%
rename from src/java/org/kabeja/tools/FontManager.java
rename to core/src/main/java/org/kabeja/tools/FontManager.java
diff --git a/src/java/org/kabeja/tools/SAXFilterConfig.java b/core/src/main/java/org/kabeja/tools/SAXFilterConfig.java
similarity index 100%
rename from src/java/org/kabeja/tools/SAXFilterConfig.java
rename to core/src/main/java/org/kabeja/tools/SAXFilterConfig.java
diff --git a/src/java/org/kabeja/tools/SAXProcessingManagerBuilder.java b/core/src/main/java/org/kabeja/tools/SAXProcessingManagerBuilder.java
similarity index 100%
rename from src/java/org/kabeja/tools/SAXProcessingManagerBuilder.java
rename to core/src/main/java/org/kabeja/tools/SAXProcessingManagerBuilder.java
diff --git a/src/java/org/kabeja/tools/SAXSerializerConfig.java b/core/src/main/java/org/kabeja/tools/SAXSerializerConfig.java
similarity index 100%
rename from src/java/org/kabeja/tools/SAXSerializerConfig.java
rename to core/src/main/java/org/kabeja/tools/SAXSerializerConfig.java
diff --git a/src/java/org/kabeja/ui/Application.java b/core/src/main/java/org/kabeja/ui/Application.java
similarity index 100%
rename from src/java/org/kabeja/ui/Application.java
rename to core/src/main/java/org/kabeja/ui/Application.java
diff --git a/src/java/org/kabeja/ui/ApplicationMenuBar.java b/core/src/main/java/org/kabeja/ui/ApplicationMenuBar.java
similarity index 100%
rename from src/java/org/kabeja/ui/ApplicationMenuBar.java
rename to core/src/main/java/org/kabeja/ui/ApplicationMenuBar.java
diff --git a/src/java/org/kabeja/ui/ApplicationToolBar.java b/core/src/main/java/org/kabeja/ui/ApplicationToolBar.java
similarity index 100%
rename from src/java/org/kabeja/ui/ApplicationToolBar.java
rename to core/src/main/java/org/kabeja/ui/ApplicationToolBar.java
diff --git a/src/java/org/kabeja/ui/Component.java b/core/src/main/java/org/kabeja/ui/Component.java
similarity index 100%
rename from src/java/org/kabeja/ui/Component.java
rename to core/src/main/java/org/kabeja/ui/Component.java
diff --git a/src/java/org/kabeja/ui/DXFDocumentViewComponent.java b/core/src/main/java/org/kabeja/ui/DXFDocumentViewComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/DXFDocumentViewComponent.java
rename to core/src/main/java/org/kabeja/ui/DXFDocumentViewComponent.java
diff --git a/src/java/org/kabeja/ui/Main.java b/core/src/main/java/org/kabeja/ui/Main.java
similarity index 100%
rename from src/java/org/kabeja/ui/Main.java
rename to core/src/main/java/org/kabeja/ui/Main.java
diff --git a/src/java/org/kabeja/ui/ProcessingUIComponent.java b/core/src/main/java/org/kabeja/ui/ProcessingUIComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/ProcessingUIComponent.java
rename to core/src/main/java/org/kabeja/ui/ProcessingUIComponent.java
diff --git a/src/java/org/kabeja/ui/PropertiesEditor.java b/core/src/main/java/org/kabeja/ui/PropertiesEditor.java
similarity index 100%
rename from src/java/org/kabeja/ui/PropertiesEditor.java
rename to core/src/main/java/org/kabeja/ui/PropertiesEditor.java
diff --git a/src/java/org/kabeja/ui/PropertiesListener.java b/core/src/main/java/org/kabeja/ui/PropertiesListener.java
similarity index 100%
rename from src/java/org/kabeja/ui/PropertiesListener.java
rename to core/src/main/java/org/kabeja/ui/PropertiesListener.java
diff --git a/src/java/org/kabeja/ui/ServiceManager.java b/core/src/main/java/org/kabeja/ui/ServiceManager.java
similarity index 100%
rename from src/java/org/kabeja/ui/ServiceManager.java
rename to core/src/main/java/org/kabeja/ui/ServiceManager.java
diff --git a/src/java/org/kabeja/ui/Serviceable.java b/core/src/main/java/org/kabeja/ui/Serviceable.java
similarity index 100%
rename from src/java/org/kabeja/ui/Serviceable.java
rename to core/src/main/java/org/kabeja/ui/Serviceable.java
diff --git a/src/java/org/kabeja/ui/Startable.java b/core/src/main/java/org/kabeja/ui/Startable.java
similarity index 100%
rename from src/java/org/kabeja/ui/Startable.java
rename to core/src/main/java/org/kabeja/ui/Startable.java
diff --git a/src/java/org/kabeja/ui/UIApplication.java b/core/src/main/java/org/kabeja/ui/UIApplication.java
similarity index 100%
rename from src/java/org/kabeja/ui/UIApplication.java
rename to core/src/main/java/org/kabeja/ui/UIApplication.java
diff --git a/src/java/org/kabeja/ui/UIException.java b/core/src/main/java/org/kabeja/ui/UIException.java
similarity index 100%
rename from src/java/org/kabeja/ui/UIException.java
rename to core/src/main/java/org/kabeja/ui/UIException.java
diff --git a/src/java/org/kabeja/ui/ViewComponent.java b/core/src/main/java/org/kabeja/ui/ViewComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/ViewComponent.java
rename to core/src/main/java/org/kabeja/ui/ViewComponent.java
diff --git a/src/java/org/kabeja/ui/event/DXFDocumentChangeEventProvider.java b/core/src/main/java/org/kabeja/ui/event/DXFDocumentChangeEventProvider.java
similarity index 100%
rename from src/java/org/kabeja/ui/event/DXFDocumentChangeEventProvider.java
rename to core/src/main/java/org/kabeja/ui/event/DXFDocumentChangeEventProvider.java
diff --git a/src/java/org/kabeja/ui/event/DXFDocumentChangeListener.java b/core/src/main/java/org/kabeja/ui/event/DXFDocumentChangeListener.java
similarity index 100%
rename from src/java/org/kabeja/ui/event/DXFDocumentChangeListener.java
rename to core/src/main/java/org/kabeja/ui/event/DXFDocumentChangeListener.java
diff --git a/src/java/org/kabeja/ui/impl/AboutAction.java b/core/src/main/java/org/kabeja/ui/impl/AboutAction.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/AboutAction.java
rename to core/src/main/java/org/kabeja/ui/impl/AboutAction.java
diff --git a/src/java/org/kabeja/ui/impl/AbstractPropertiesEditor.java b/core/src/main/java/org/kabeja/ui/impl/AbstractPropertiesEditor.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/AbstractPropertiesEditor.java
rename to core/src/main/java/org/kabeja/ui/impl/AbstractPropertiesEditor.java
diff --git a/src/java/org/kabeja/ui/impl/DXFFileTransferHandler.java b/core/src/main/java/org/kabeja/ui/impl/DXFFileTransferHandler.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/DXFFileTransferHandler.java
rename to core/src/main/java/org/kabeja/ui/impl/DXFFileTransferHandler.java
diff --git a/src/java/org/kabeja/ui/impl/MemoryUsageToolbarComponent.java b/core/src/main/java/org/kabeja/ui/impl/MemoryUsageToolbarComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/MemoryUsageToolbarComponent.java
rename to core/src/main/java/org/kabeja/ui/impl/MemoryUsageToolbarComponent.java
diff --git a/src/java/org/kabeja/ui/impl/Messages.java b/core/src/main/java/org/kabeja/ui/impl/Messages.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/Messages.java
rename to core/src/main/java/org/kabeja/ui/impl/Messages.java
diff --git a/src/java/org/kabeja/ui/impl/OpenProcessingAction.java b/core/src/main/java/org/kabeja/ui/impl/OpenProcessingAction.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/OpenProcessingAction.java
rename to core/src/main/java/org/kabeja/ui/impl/OpenProcessingAction.java
diff --git a/src/java/org/kabeja/ui/impl/ProcessingEditorViewComponent.java b/core/src/main/java/org/kabeja/ui/impl/ProcessingEditorViewComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/ProcessingEditorViewComponent.java
rename to core/src/main/java/org/kabeja/ui/impl/ProcessingEditorViewComponent.java
diff --git a/src/java/org/kabeja/ui/impl/ProcessingRunViewComponent.java b/core/src/main/java/org/kabeja/ui/impl/ProcessingRunViewComponent.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/ProcessingRunViewComponent.java
rename to core/src/main/java/org/kabeja/ui/impl/ProcessingRunViewComponent.java
diff --git a/src/java/org/kabeja/ui/impl/ProcessingTreeViewBuilder.java b/core/src/main/java/org/kabeja/ui/impl/ProcessingTreeViewBuilder.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/ProcessingTreeViewBuilder.java
rename to core/src/main/java/org/kabeja/ui/impl/ProcessingTreeViewBuilder.java
diff --git a/src/java/org/kabeja/ui/impl/ProcessingUI.java b/core/src/main/java/org/kabeja/ui/impl/ProcessingUI.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/ProcessingUI.java
rename to core/src/main/java/org/kabeja/ui/impl/ProcessingUI.java
diff --git a/src/java/org/kabeja/ui/impl/ServiceContainer.java b/core/src/main/java/org/kabeja/ui/impl/ServiceContainer.java
similarity index 100%
rename from src/java/org/kabeja/ui/impl/ServiceContainer.java
rename to core/src/main/java/org/kabeja/ui/impl/ServiceContainer.java
diff --git a/src/java/org/kabeja/ui/model/AbstractProcessingTreeNode.java b/core/src/main/java/org/kabeja/ui/model/AbstractProcessingTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/AbstractProcessingTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/AbstractProcessingTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/ParserTreeNode.java b/core/src/main/java/org/kabeja/ui/model/ParserTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/ParserTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/ParserTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/ParsersTreeNode.java b/core/src/main/java/org/kabeja/ui/model/ParsersTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/ParsersTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/ParsersTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/PipelineTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PipelineTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PipelineTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PipelineTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/PipelinesTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PipelinesTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PipelinesTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PipelinesTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/PostProcessorTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PostProcessorTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PostProcessorTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PostProcessorTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/PostProcessorsTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PostProcessorsTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PostProcessorsTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PostProcessorsTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/ProcessingTreeModelPresenter.java b/core/src/main/java/org/kabeja/ui/model/ProcessingTreeModelPresenter.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/ProcessingTreeModelPresenter.java
rename to core/src/main/java/org/kabeja/ui/model/ProcessingTreeModelPresenter.java
diff --git a/src/java/org/kabeja/ui/model/PropertiesTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PropertiesTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PropertiesTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PropertiesTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/PropertyTreeNode.java b/core/src/main/java/org/kabeja/ui/model/PropertyTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/PropertyTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/PropertyTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXFilterTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXFilterTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXFilterTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXFilterTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXFiltersTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXFiltersTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXFiltersTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXFiltersTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXGeneratorTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXGeneratorTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXGeneratorTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXGeneratorTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXGeneratorsTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXGeneratorsTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXGeneratorsTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXGeneratorsTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXSerializerTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXSerializerTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXSerializerTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXSerializerTreeNode.java
diff --git a/src/java/org/kabeja/ui/model/SAXSerializersTreeNode.java b/core/src/main/java/org/kabeja/ui/model/SAXSerializersTreeNode.java
similarity index 100%
rename from src/java/org/kabeja/ui/model/SAXSerializersTreeNode.java
rename to core/src/main/java/org/kabeja/ui/model/SAXSerializersTreeNode.java
diff --git a/src/java/org/kabeja/ui/xml/SAXServiceContainerBuilder.java b/core/src/main/java/org/kabeja/ui/xml/SAXServiceContainerBuilder.java
similarity index 100%
rename from src/java/org/kabeja/ui/xml/SAXServiceContainerBuilder.java
rename to core/src/main/java/org/kabeja/ui/xml/SAXServiceContainerBuilder.java
diff --git a/src/java/org/kabeja/xml/AbstractSAXFilter.java b/core/src/main/java/org/kabeja/xml/AbstractSAXFilter.java
similarity index 100%
rename from src/java/org/kabeja/xml/AbstractSAXFilter.java
rename to core/src/main/java/org/kabeja/xml/AbstractSAXFilter.java
diff --git a/src/java/org/kabeja/xml/AbstractSAXGenerator.java b/core/src/main/java/org/kabeja/xml/AbstractSAXGenerator.java
similarity index 100%
rename from src/java/org/kabeja/xml/AbstractSAXGenerator.java
rename to core/src/main/java/org/kabeja/xml/AbstractSAXGenerator.java
diff --git a/src/java/org/kabeja/xml/AbstractSAXSerializer.java b/core/src/main/java/org/kabeja/xml/AbstractSAXSerializer.java
similarity index 100%
rename from src/java/org/kabeja/xml/AbstractSAXSerializer.java
rename to core/src/main/java/org/kabeja/xml/AbstractSAXSerializer.java
diff --git a/src/java/org/kabeja/xml/AggregatorGenerator.java b/core/src/main/java/org/kabeja/xml/AggregatorGenerator.java
similarity index 100%
rename from src/java/org/kabeja/xml/AggregatorGenerator.java
rename to core/src/main/java/org/kabeja/xml/AggregatorGenerator.java
diff --git a/src/java/org/kabeja/xml/ConsoleSerializer.java b/core/src/main/java/org/kabeja/xml/ConsoleSerializer.java
similarity index 100%
rename from src/java/org/kabeja/xml/ConsoleSerializer.java
rename to core/src/main/java/org/kabeja/xml/ConsoleSerializer.java
diff --git a/src/java/org/kabeja/xml/SAXFilter.java b/core/src/main/java/org/kabeja/xml/SAXFilter.java
similarity index 100%
rename from src/java/org/kabeja/xml/SAXFilter.java
rename to core/src/main/java/org/kabeja/xml/SAXFilter.java
diff --git a/src/java/org/kabeja/xml/SAXGenerator.java b/core/src/main/java/org/kabeja/xml/SAXGenerator.java
similarity index 100%
rename from src/java/org/kabeja/xml/SAXGenerator.java
rename to core/src/main/java/org/kabeja/xml/SAXGenerator.java
diff --git a/src/java/org/kabeja/xml/SAXPrettyOutputter.java b/core/src/main/java/org/kabeja/xml/SAXPrettyOutputter.java
similarity index 97%
rename from src/java/org/kabeja/xml/SAXPrettyOutputter.java
rename to core/src/main/java/org/kabeja/xml/SAXPrettyOutputter.java
index 51b98cfe..d17e2d0e 100755
--- a/src/java/org/kabeja/xml/SAXPrettyOutputter.java
+++ b/core/src/main/java/org/kabeja/xml/SAXPrettyOutputter.java
@@ -206,11 +206,9 @@ public void startElement(String namespaceURI, String localName,
                 // + "\" ");
                 // }
                 String value = atts.getValue(i);
-                if(value == null){
-                	value="";
+                if (value != null && !"".equals(value)){
+                   this.out.write(qname + "=\"" + encodeXML(value) + "\"");
                 }
-                this.out.write(qname + "=\"" + encodeXML(atts.getValue(i)) +
-                    "\"");
             }
         } catch (IOException e) {
             // TODO Auto-generated catch block
@@ -333,7 +331,7 @@ public void setProperties(Map properties) {
         }
 
         if (properties.containsKey(PROPERTY_GZIP)) {
-            this.gzip = Boolean.getBoolean((String) properties.get(
+            this.gzip = Boolean.parseBoolean((String) properties.get(
                         PROPERTY_GZIP));
         }
     }
diff --git a/src/java/org/kabeja/xml/SAXSerializer.java b/core/src/main/java/org/kabeja/xml/SAXSerializer.java
similarity index 100%
rename from src/java/org/kabeja/xml/SAXSerializer.java
rename to core/src/main/java/org/kabeja/xml/SAXSerializer.java
diff --git a/src/java/org/kabeja/xml/XMLConstants.java b/core/src/main/java/org/kabeja/xml/XMLConstants.java
similarity index 100%
rename from src/java/org/kabeja/xml/XMLConstants.java
rename to core/src/main/java/org/kabeja/xml/XMLConstants.java
diff --git a/src/java/org/kabeja/ui/impl/messages.properties b/core/src/main/resources/org/kabeja/ui/impl/messages.properties
similarity index 100%
rename from src/java/org/kabeja/ui/impl/messages.properties
rename to core/src/main/resources/org/kabeja/ui/impl/messages.properties
diff --git a/src/java/org/kabeja/ui/impl/messages_de_DE.properties b/core/src/main/resources/org/kabeja/ui/impl/messages_de_DE.properties
similarity index 100%
rename from src/java/org/kabeja/ui/impl/messages_de_DE.properties
rename to core/src/main/resources/org/kabeja/ui/impl/messages_de_DE.properties
diff --git a/src/test/org/kabeja/dxf/DXFExtrusionTest.java b/core/src/test/java/org/kabeja/dxf/DXFExtrusionTest.java
similarity index 100%
rename from src/test/org/kabeja/dxf/DXFExtrusionTest.java
rename to core/src/test/java/org/kabeja/dxf/DXFExtrusionTest.java
diff --git a/src/test/org/kabeja/dxf/DXFPolylineTest.java b/core/src/test/java/org/kabeja/dxf/DXFPolylineTest.java
similarity index 100%
rename from src/test/org/kabeja/dxf/DXFPolylineTest.java
rename to core/src/test/java/org/kabeja/dxf/DXFPolylineTest.java
diff --git a/src/test/org/kabeja/math/NURBSTest.java b/core/src/test/java/org/kabeja/math/NURBSTest.java
similarity index 100%
rename from src/test/org/kabeja/math/NURBSTest.java
rename to core/src/test/java/org/kabeja/math/NURBSTest.java
diff --git a/src/test/org/kabeja/math/ParametricPlaneTest.java b/core/src/test/java/org/kabeja/math/ParametricPlaneTest.java
similarity index 100%
rename from src/test/org/kabeja/math/ParametricPlaneTest.java
rename to core/src/test/java/org/kabeja/math/ParametricPlaneTest.java
diff --git a/src/test/org/kabeja/parser/DXFValueTest.java b/core/src/test/java/org/kabeja/parser/DXFValueTest.java
similarity index 100%
rename from src/test/org/kabeja/parser/DXFValueTest.java
rename to core/src/test/java/org/kabeja/parser/DXFValueTest.java
diff --git a/font.xml b/font.xml
old mode 100755
new mode 100644
diff --git a/install-legacy-lib.sh b/install-legacy-lib.sh
new file mode 100755
index 00000000..69726212
--- /dev/null
+++ b/install-legacy-lib.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+mvn install:install-file -DgroupId=de.miethxml  \
+-DartifactId=miethxml-ui \
+-Dversion=0.0.1  \
+-Dfile=legacy-lib/miethxml-ui.jar  \
+-Dpackaging=jar \
+-DgeneratePom=true
diff --git a/kabeja.sh b/kabeja.sh
old mode 100644
new mode 100755
diff --git a/lib/miethxml-ui.jar b/legacy-lib/miethxml-ui.jar
similarity index 100%
rename from lib/miethxml-ui.jar
rename to legacy-lib/miethxml-ui.jar
diff --git a/pom.xml b/pom.xml
index e11307f3..400ebe73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,153 +1,203 @@
 <?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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.kabeja</groupId>
-	<artifactId>kabeja</artifactId>
-	<name>Kabeja</name>
-	<version>0.3.1</version>
-	<description>
-		Kabeja is a java library for parsing DXF and converting to SVG
-		(dxf2svg). The library supports the SAX-api and can integrated
-		into other applications (Cocoon,Batik). Tools for converting svg
-		to jpeg, tiff, png and pdf are included.
-	</description>
-	<url>http://kabeja.sourceforge.net/</url>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>
-			http://sourceforge.net/tracker/?group_id=152775&amp;atid=785363
-		</url>
-	</issueManagement>
-	<inceptionYear>2005</inceptionYear>
-	<developers>
-		<developer>
-			<id>simijhag</id>
-			<name>Simon Mieth</name>
-			<email>simon.mieth@gmx.de</email>
-			<roles>
-				<role>Admin</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
-	</developers>
-	<licenses>
-		<license>
-			<name>Apache License V2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>manual</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>
-			scm:cvs:pserver:anonymous@${pom.artifactId}.cvs.sourceforge.net:/cvsroot/${pom.artifactId}:${pom.artifactId}/
-		</connection>
-		<developerConnection>
-			scm:cvs:ext:developername@${pom.artifactId}.cvs.sourceforge.net:/cvsroot/${pom.artifactId}:${pom.artifactId}/
-		</developerConnection>
-		<url>
-			http://${pom.artifactId}.cvs.sourceforge.net/${pom.artifactId}/${pom.artifactId}/
-		</url>
-	</scm>
-	<build>
-		<sourceDirectory>${basedir}/src/java</sourceDirectory>
-		<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<verbose>true</verbose>
-					<fork>true</fork>
-					<encoding>utf-8</encoding>
-					<optimize>false</optimize>
-					<compilerVersion>1.4</compilerVersion>
-					<source>1.3</source>
-					<target>1.3</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<source>1.3</source>
-					<verbose>false</verbose>
-					<links>
-						<link>
-							http://java.sun.com/j2se/1.3.0/docs/api/
-						</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>surefire-report-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>changelog-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jxr-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<configuration>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-						<tag>@deprecated</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>
-					maven-project-info-reports-plugin
-				</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<configuration>
-					<targetJdk>1.3</targetJdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-			</plugin>
-		</plugins>
-	</reporting>
-</project>
+    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>org.kabeja</groupId>
+    <artifactId>kabeja</artifactId>
+    <name>kabeja</name>
+    <version>0.4.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <description>Kabeja is a java library for parsing DXF and converting to SVG
+(dxf2svg). The library supports the SAX-api and can integrated
+into other applications (Cocoon,Batik). Tools for converting svg
+to jpeg, tiff, png and pdf are included.
+    </description>
+    <url>http://kabeja.sourceforge.net/</url>
+
+    <modules>
+        <module>core</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>blocks</id>
+            <modules>
+                <module>blocks/svg</module>
+                <module>blocks/inkscape</module>
+                <module>blocks/xslt</module>
+                <!-- module>blocks/cocoon</module -->
+            </modules>
+        </profile>
+    </profiles>
+
+    <issueManagement>
+        <system>Bugzilla</system>
+        <url>
+            http://sourceforge.net/tracker/?group_id=152775&amp;atid=785363
+        </url>
+    </issueManagement>
 
+    <inceptionYear>2005</inceptionYear>
+
+    <developers>
+        <developer>
+            <id>simijhag</id>
+            <name>Simon Mieth</name>
+            <email>simon.mieth@gmx.de</email>
+            <roles>
+                <role>Admin</role>
+                <role>Developer</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <id>michele</id>
+            <name>Michele Franzin</name>
+            <email>michele.franzin@gmail.com</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
+    <licenses>
+        <license>
+            <name>Apache License V2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>manual</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>
+            scm:cvs:pserver:anonymous@${project.artifactId}.cvs.sourceforge.net:/cvsroot/${project.artifactId}:${project.artifactId}/
+        </connection>
+        <developerConnection>
+            scm:cvs:ext:developername@${project.artifactId}.cvs.sourceforge.net:/cvsroot/${project.artifactId}:${project.artifactId}/
+        </developerConnection>
+        <url>
+            http://${project.artifactId}.cvs.sourceforge.net/${project.artifactId}/${project.artifactId}/
+        </url>
+    </scm>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <verbose>true</verbose>
+                    <fork>true</fork>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <optimize>false</optimize>
+                    <compilerVersion>1.6</compilerVersion>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+                <version>2.3.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <verbose>false</verbose>
+                    <links>
+                        <link>
+                            http://download.oracle.com/javase/1.5.0/docs/api/
+                        </link>
+                    </links>
+                </configuration>
+                <version>2.7</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>surefire-report-maven-plugin</artifactId>
+                <version>2.0-beta-1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>changelog-maven-plugin</artifactId>
+                <version>2.0-beta-1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jxr-maven-plugin</artifactId>
+                <version>2.0-beta-1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <configuration>
+                    <tags>
+                        <tag>TODO</tag>
+                        <tag>FIXME</tag>
+                        <tag>@deprecated</tag>
+                    </tags>
+                </configuration>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <artifactId>
+                    maven-project-info-reports-plugin
+                </artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <configuration>
+                    <targetJdk>1.5</targetJdk>
+                </configuration>
+                <version>2.5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>