diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
deleted file mode 100644
index 78c6009..0000000
--- a/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_26-b03-384-10M3425 (Apple Inc.)
-Bundle-ManifestVersion: 2
-Bundle-Name: Protege OBO plugin
-Bundle-SymbolicName: org.protege.oboeditor;singleton:=true
-Bundle-Category: protege
-Bundle-Description: Plugin for viewing OBO ontologies in Protege
-Bundle-DocURL: http://github.com/hdietze/protege-obo-plugins
-Bundle-ClassPath: .,   resources/
-Update-Url: https://raw.githubusercontent.com/hdietze/protege-obo-plugins/master/org.protege.oboeditor.properties   
-Import-Package: org.osgi.framework,org.apache.log4j,javax.swing,javax.
- swing.event,javax.swing.tree,javax.swing.border,javax.swing.table,javax.swing.plaf,javax.swing.plaf.basic
-Bundle-Version: 0.1
-Bundle-Activator: org.protege.editor.core.plugin.DefaultPluginActivator
-Require-Bundle: org.eclipse.equinox.registry,org.eclipse.equinox.common,org.protege.editor.core.application;bundle-version="4.1",org.protege.editor.owl;bundle-version="4.1",org.semanticweb.owl.owlapi;bundle-version="3.1"
diff --git a/build.xml b/build.xml
deleted file mode 100644
index c77bf28..0000000
--- a/build.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version = "1.0" encoding = "utf-8"?>
-<project name = "OBO view" default = "install" basedir = ".">
-   <property file="local.properties"/>
-   <property environment="env"/>
-
-   <property name="main.resources"  location="./resources"/>
-   <property name="main.source"     location="./src"/>
-   <property name="main.icons"      location="./icons"/>
-
-   <!-- 
-        To run this build file set the environment variable
-        PROTEGE_HOME to point to a protege distribution and type ant
-        install or jar.
-     -->
-   <property name="protege.home"      location="${env.PROTEGE_HOME}"/>
-	
-   <!-- ============================================================= -->
-   <!-- 
-        This section may need to be customized by the developer for a 
-        particular project 
-     -->
-
-   <!-- 
-        This setting defines the name of the plugin.
-        This may be the only setting that the developer needs to
-        change.
-     -->
-   <property name = "plugin"          value = "org.protege.oboeditor"/>
-
-   
-   <!-- 
-        Here is the copy.resources target.  It may need modification
-        to copy the right resources into the classes directory.  By
-        default it already copies non-java files found in the source
-        directory, the libraries needed by the project and the
-        viewconfig and the plugin.xml.  This will be sufficient in
-        many cases. 
-     -->
-   <target name="copy.resources" depends="build.manifest">
-     <copy todir="${classes}">
-       <fileset dir="${main.source}">
-         <include name="**/*"/>
-         <exclude name="**/*.java"/>
-         <exclude name="**/MANIFEST.MF"/>
-         <exclude name="**/manifest.mf"/>
-       </fileset>
-       <fileset dir="${main.resources}"/>
-     </copy>
-     <copy todir="${classes}/icons">
-       <fileset dir="${main.icons}"/>
-     </copy>
-     <copy todir="${classes}">
-       <fileset dir="." includes="*.xml">
-           <exclude name="build.xml"/>
-       </fileset>
-     </copy>
-   	 <!-- the manifest doesn't belong here but this is good for IDE's -->
-     <mkdir dir="${classes}/META-INF"/>  
-     <copy todir="${classes}/META-INF"   
-           file = "${manifest}"/>
-   </target>
-
-
-   <!-- 
-        The following target only needs to be modified if the
-        developer needs to obtain some jar files that are contained in
-        the Protege bundles.  The contents of these jar files are
-        found when Protege 4 runs but may be needed in order to
-        compile the plugin. 
-     -->
-   <target name = "buildlibs" depends="init, checkProtegeLibsAndReport">
-       <unjar dest="${build}"
-              src="${common.lib}">
-           <patternset>
-               <include name = "**/log4j.jar"/>
-           </patternset>
-       </unjar>
-   </target>
-
-
-
-   <!-- 
-        The following target only needs to be modified if the user
-        needs to change the classpath.  It is preconfigured to use
-        the common protege 4 jars, the lib directory and the
-        libraries that have been uncovered in buildlibs. 
-     -->
-   <target name = "checkProtegeLibs">
-     <echo message="Using Protege Home = ${protege.home} to find protege jars"/>
-     <condition property="libs.found">
-       <and>
-	 <available file="${equinox.common}" type = "file"/>
-	 <available file="${equinox.registry}" type = "file"/>
-	 <available file="${owl.editor.jar}" type = "file"/>
-         <available file="${owl.lib}" type="file"/>
-       </and>
-     </condition>
-     <path id = "project.classpath">    
-       <pathelement location = "${protege.lib}"/>
-       <pathelement location="${equinox.common}"/>
-       <pathelement location="${equinox.registry}"/>
-       <pathelement location="${owl.editor.jar}"/>
-       <pathelement location="${owl.lib}"/>
-     </path>
-   </target>
-
-
-   <!-- 
-        It is less likely that the developer will want to make changes
-        below this line 
-        -->
-   <!-- ============================================================= -->
-
-   <property name = "build"           location = "./build"/>
-   <property name = "classes"         location = "${build}/classes"/>
-   <property name = "manifest"        location = "${build}/manifest.mf"/>
-
-   <!-- 
-        This is the section that changes for different distributions.
-        It would only need small changes for knopflerfish or felix.
-     -->
-
-   <property name="osgi"
-             location="${protege.home}/org.eclipse.osgi.jar"/>
-   <property name="equinox.common" 
-             location="${protege.home}/bundles/org.eclipse.equinox.common.jar"/>
-   <property name="equinox.registry"
-             location="${protege.home}/bundles/org.eclipse.equinox.registry.jar"/>
-   <property name="protege.lib" 
-             location="${protege.home}/bundles/org.protege.editor.core.application.jar"/>
-   <property name="common.lib"
-             location="${protege.home}/bundles/org.protege.common.jar"/>
-
-   <property name="owl.lib"
-             location="${protege.home}/plugins/org.semanticweb.owl.owlapi.jar"/>
-
-   <property name="owl.editor.jar"
-	     location="${protege.home}/plugins/org.protege.editor.owl.jar"/>
-
-   <!-- end of equinox specific settings -->
-
-
-   <target name = "usage">
-     <echo message = "To run this script set the PROTEGE_HOME environment"/>
-     <echo message = "variable and use one of the following targets"/>
-     <echo message = "jar - builds the jar (bundle) file for this project"/>
-     <echo message = "install - installs  the bundle into the Protege distribution"/>
-     <echo message = "copy.resources - copyies resources into the classes directory"/>
-     <echo message = "    this can  be useful for ide developers - see the wiki"/>
-   </target>
-
-   <target name = "init">
-     <mkdir dir="${main.icons}"/>
-     <mkdir dir="${main.resources}"/>
-     <tstamp>
-       <format property="build.time" pattern="MM/dd/yyyy hh:mm aa"/>
-     </tstamp>
-     <mkdir dir = "${build}"/>
-     <mkdir dir = "${classes}"/>
-     <mkdir dir = "${classes}/lib"/>
-     <mkdir dir = "${classes}/icons"/>
-   </target>  
-   	
-   <target name="checkProtegeHome">
-       <condition property="protege.home.set">
-           <available file="${protege.home}/org.protege.editor.core.application.jar" type="file"/>
-       </condition>
-   </target>
-
-    <target name="checkProtegeLibsAndReport" depends="checkProtegeLibs"
-            unless="libs.found">
-      <echo message="Missing protege libraries.  You need to set "/>
-      <echo message="the PROTEGE_HOME environment variable to a"/>
-      <echo message="protege installation directory where the"/>
-      <echo message="appropriate plugins have been installed."/>
-      <echo message="Alternatively set the jar libs in local.properties (protege.lib=...)"/>
-      <echo message="Use the -v option to ant to see what jars are missing."/>
-      <fail message = "missing protege libraries"/>
-    </target>
-      
-
-   <target name = "compile" depends = "buildlibs, checkProtegeLibsAndReport">
-     <javac srcdir="${main.source}"
-            excludes="org/coode/matrix/test/*,java"
-            destdir = "${classes}" 
-            debug="on"
-            includeAntRuntime="false">
-       <classpath refid = "project.classpath"/>  
-     </javac>
-   </target>
-
-   <target name="build.manifest">
-     <copy tofile="${manifest}" 
-           file="META-INF/MANIFEST.MF" overwrite="true"/>
-     <manifest file="${manifest}" 
-               mode = "update">
-        <attribute name="Built-By" value = "${user.name}"/>
-        <attribute name="Build-Date" value = "${build.time}"/>
-     </manifest>
-   </target>
-
-   <target name = "jar" depends = "compile, copy.resources">
-     <jar jarfile = "${build}/${plugin}.jar"
-          basedir = "${classes}" 
-          manifest = "${build}/manifest.mf"/>
-   </target>
-
-   <target name = "install" depends = "jar">
-     <copy file="${build}/${plugin}.jar" 
-           todir = "${protege.home}/plugins"
-           overwrite = "true"/>
-   </target>
-
-   <target name = "clean">
-     <delete dir = "${build}"/>
-   </target>
-
-</project>
diff --git a/org.protege.oboeditor.iml b/org.protege.oboeditor.iml
deleted file mode 100644
index 028b74f..0000000
--- a/org.protege.oboeditor.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="org.protege.editor.owl" />
-    <orderEntry type="module" module-name="org.semanticweb.owl.owlapi" />
-  </component>
-</module>
-
diff --git a/pom.xml b/pom.xml
index cb1d61b..ff22aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,146 @@
 <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>
+    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.protege.plugins</groupId>
-	<artifactId>obo-plugin</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>org.geneontology</groupId>
+    <artifactId>obo-plugin</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-	<name>Protege OBO plugins</name>
+    <name>Protege OBO plugin</name>
+    <description>A plug-in for Protege that provides entry fields for standard OBO annotation properties.</description>
+    <organization>
+        <name>Gene Ontology Consortium</name>
+        <url>http://geneontology.org</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>BSD-3-Clause</name>
+            <url>https://opensource.org/licenses/BSD-3-Clause</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    
+    <developers>
+        <developer>
+            <id>simonjupp</id>
+            <name>Simon Jupp</name>
+        </developer>
+        <developer>
+            <id>hdietze</id>
+            <name>Heiko Dietze</name>
+        </developer>
+        <developer>
+            <id>balhoff</id>
+            <name>Jim Balhoff</name>
+            <email>jim@balhoff.org</email>
+        </developer>
+    </developers>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <protege.version>5.1.0</protege.version>
+        <owlapi.version>4.2.6</owlapi.version>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.owlapi</groupId>
+            <artifactId>owlapi-osgidistribution</artifactId>
+            <version>${owlapi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.stanford.protege</groupId>
+            <artifactId>protege-common</artifactId>
+            <version>${protege.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.stanford.protege</groupId>
+            <artifactId>protege-editor-core</artifactId>
+            <version>${protege.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.stanford.protege</groupId>
+            <artifactId>protege-editor-owl</artifactId>
+            <version>${protege.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<sourceDirectory>${project.basedir}/src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.0.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Activator>org.protege.editor.owl.ProtegeOWL</Bundle-Activator>
+                        <Bundle-ClassPath>.</Bundle-ClassPath>
+                        <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                        <Bundle-Vendor>The Protege Development Team</Bundle-Vendor>
+                        <Import-Package>
+                            org.protege.editor.core.*;version="5.1.0",
+                            org.protege.editor.owl.*;version="5.1.0",
+                            org.semanticweb.owlapi.*;version="[4.2.6,5.0.0)",
+                            *
+                        </Import-Package>
+                        <Include-Resource>{maven-resources}</Include-Resource>
+                        <Private-Package>${project.artifactId}</Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <pde>true</pde>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>edu.stanford.protege</groupId>
-			<artifactId>org.protege.editor.owl</artifactId>
-			<version>4.3.0</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
 </project>
diff --git a/src/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java b/src/main/java/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
rename to src/main/java/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
diff --git a/src/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java b/src/main/java/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
rename to src/main/java/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationEditor.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationEditor.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationEditor.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationEditor.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrame.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrame.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrame.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrame.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrameList.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
diff --git a/src/org/protege/oboeditor/frames/OBOXrefButton.java b/src/main/java/org/protege/oboeditor/frames/OBOXrefButton.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOXrefButton.java
rename to src/main/java/org/protege/oboeditor/frames/OBOXrefButton.java
diff --git a/src/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java b/src/main/java/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
similarity index 100%
rename from src/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
rename to src/main/java/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
diff --git a/src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java b/src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
similarity index 99%
rename from src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
rename to src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
index d58a7ac..0d79c21 100644
--- a/src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
+++ b/src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
@@ -1,6 +1,6 @@
 package org.protege.oboeditor.renderer;
 
-import org.coode.string.EscapeUtils;
+import org.semanticweb.owlapi.util.EscapeUtils;
 import org.protege.editor.owl.OWLEditorKit;
 import org.protege.editor.owl.model.OWLModelManager;
 import org.protege.editor.owl.ui.renderer.layout.*;
diff --git a/src/org/protege/oboeditor/renderer/OBOFrameListRenderer.java b/src/main/java/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
similarity index 100%
rename from src/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
rename to src/main/java/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
diff --git a/src/org/protege/oboeditor/util/OBOVocabulary.java b/src/main/java/org/protege/oboeditor/util/OBOVocabulary.java
similarity index 100%
rename from src/org/protege/oboeditor/util/OBOVocabulary.java
rename to src/main/java/org/protege/oboeditor/util/OBOVocabulary.java
diff --git a/src/org/protege/oboeditor/views/OBOAnnotationViewComponent.java b/src/main/java/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
similarity index 100%
rename from src/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
rename to src/main/java/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
diff --git a/plugin.xml b/src/main/resources/plugin.xml
similarity index 100%
rename from plugin.xml
rename to src/main/resources/plugin.xml
diff --git a/org.protege.oboeditor.properties b/src/main/resources/update.properties
similarity index 77%
rename from org.protege.oboeditor.properties
rename to src/main/resources/update.properties
index 2b32eea..55e7b42 100644
--- a/org.protege.oboeditor.properties
+++ b/src/main/resources/update.properties
@@ -1,6 +1,7 @@
 id=org.protege.oboeditor
-version=0.1
+version=${project.version}
 download=https://github.com/hdietze/protege-obo-plugins/blob/master/org.protege.oboeditor.jar?raw=true
 name=Protege OBO plugin
 readme=https://raw.githubusercontent.com/hdietze/protege-obo-plugins/master/README.txt
+license=https://opensource.org/licenses/BSD-3-Clause
 author=GeneOntology Consortium