diff --git a/build.xml b/build.xml
index 82691a4..f826aab 100644
--- a/build.xml
+++ b/build.xml
@@ -8,21 +8,21 @@
 	</description>
 
 	<!-- set global properties for this build -->
-	<property name="srcNS" location="src" />
-	<property name="buildNS" location="build" />
-	<property name="libNS" location="lib" />
-	<property name="release_dir" value="release" />
+	<property name="NSdir" location="../nested-sampling/" />
+	<property name="srcNS" location="${NSdir}/src" />
+	<property name="buildNS" location="${NSdir}/build" />
+	<property name="libNS" location="${NSdir}/lib" />
+	<property name="release_dir" value="${NSdir}/release" />
 	<property name="distNS" location="${buildNS}/dist" />
 	<property name="beast2path" location="../beast2" />
 	<property name="libBeast2" location="${beast2path}/lib" />
 	<property name="srcBeast2" location="${beast2path}/src" />
 	<property name="beast2classpath" location="${beast2path}/build" />
+    <property name="beastappclasspath" location="../BeastFX/build" />
+ 	<property name="buildMODEL_SELECTION" location="../model-selection/build" />
+
 	<property name="Add_on_dir" value="${release_dir}/add-on" />
-	<property name="version" value="1.1.0" />
 	
-	<property name="buildMODEL_SELECTION" location="../model-selection/build"/>
-	<property name="buildBEAST_LABS" location="../BEASTLabs/build"/>
-
 
     <import file="${beast2path}/build.xml" />
 
@@ -31,22 +31,27 @@
 
 	<path id="classpath">
         <pathelement path="${buildNS}"/>
-		<fileset dir="${libBeast2}" includes="antlr-runtime-4.7.jar"/>
-		<fileset dir="${libBeast2}" includes="junit-4.8.2.jar"/>
+		<fileset dir="${libBeast2}" includes="antlr-runtime-4.10.1.jar"/>
 		<fileset dir="${libBeast2}" includes="beagle.jar"/>
-        <fileset dir="${libBeast2}" includes="jam.jar"/>
-        <fileset dir="${libBeast2}" includes="ntlr-runtime-4.5.jar"/>
-        <fileset dir="${libBeast2}" includes="commons-math3-3.1.1.jar"/>
+        <fileset dir="${libBeast2}" includes="commons-math3-3.6.1.jar"/>
         <fileset dir="${libBeast2}" includes="colt.jar"/>
-        <fileset dir="${libBeast2}" includes="debug-1.0.jar"/>
+		<fileset dir="${libBeast2}/junit/" includes="junit-platform-console-standalone-1.8.2.jar"/>
         <pathelement path="${buildMODEL_SELECTION}"/>
-        <pathelement path="${buildBEAST_LABS}"/>
+        <pathelement path="${beastappclasspath}"/>
         <pathelement path="${beast2classpath}"/>
-	</path>
+ 	</path>
 
 	<!-- start -->
 	<target name="initNS">
 		<echo message="${ant.project.name}: ${ant.file}" />
+        <available file="${NSdir}/version.xml" property="versionAvailable"/>
+        <fail unless="versionAvailable">
+              ** Required file version.xml does not exist. **
+            </fail>
+
+        <!-- Read package name and version from xml file -->
+            <xmlproperty file="${NSdir}/version.xml" prefix="fromVersionFile" />
+        <property name="NSversion" value="${fromVersionFile.package(version)}" />
 	</target>
 
 	<target name="cleanNS">
@@ -85,9 +90,7 @@
 		       fork="true"
 		       memoryinitialsize="256m"
 		       memorymaximumsize="256m">
-			   <!--source="1.6"
-		       target="1.6"-->
-			<include name="beast/**/**" />
+			<include name="nestedsampling/**/**" />
 			<!-- compile JUnit test classes -->
 			<include name="test/beast/**" />
 		</javac>
@@ -99,37 +102,11 @@
 		<!-- Create the distribution directory -->
 		<mkdir dir="${distNS}" />
 
-		<!-- Put everything in ${buildNS} into the beast.jar file -->
-		<jar jarfile="${distNS}/NS.jar">
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Main-Class" value="${main_class_BEAST}" />
-			</manifest>
-			<fileset dir="${buildNS}">
-				<include name="**/*.class" />
-			</fileset>
-			<fileset dir="${buildMODEL_SELECTION}">
-				<include name="**/*.class" />
-			</fileset>
-			<fileset dir="${buildBEAST_LABS}">
-				<include name="**/*.class" />
-			</fileset>
-			<fileset dir="${beast2classpath}">
-				<include name="**/*.class" />
-				<include name="**/*.properties" />
-				<include name="**/*.png" />
-			</fileset>
-            <zipgroupfileset dir="${lib}" includes="jam.jar" />
-            <zipgroupfileset dir="${lib}" includes="beagle.jar" />
-            <zipgroupfileset dir="${lib}" includes="colt.jar" />
-            <zipgroupfileset dir="${lib}" includes="commons-math3-3.1.1.jar" />
-            <zipgroupfileset dir="${lib}" includes="antlr-runtime-4.7.jar"/>
-		</jar>
 		<jar jarfile="${distNS}/NS.src.jar">
 			<fileset dir="${srcNS}">
-				<include name="beast/**/*.java" />
-				<include name="beast/**/*.png" />
-				<include name="beast/**/*.xsl" />
+				<include name="nestedsampling/**/*.java" />
+				<include name="nestedsampling/**/*.png" />
+				<include name="nestedsampling/**/*.xsl" />
 			</fileset>
         </jar>
 		<jar jarfile="${distNS}/NS.addon.jar">
@@ -137,7 +114,7 @@
 				<attribute name="Built-By" value="${user.name}" />
 			</manifest>
 			<fileset dir="${buildNS}">
-				<include name="beast/**/*.class" />
+				<include name="nestedsampling/**/*.class" />
 				<include name="util/**/*.class" />
 				<include name="**/*.properties" />
 			</fileset>
@@ -193,7 +170,7 @@
 		<mkdir dir="${Add_on_dir}" />
 		<mkdir dir="${Add_on_dir}/lib" />
 		<mkdir dir="${Add_on_dir}/examples" />
-		<mkdir dir="${Add_on_dir}/templates" />
+		<mkdir dir="${Add_on_dir}/fxtemplates" />
 
 		<copy todir="${Add_on_dir}">
 			<fileset file="version.xml"/>
@@ -207,17 +184,16 @@
 		<copy todir="${Add_on_dir}">
 			<fileset dir="${distNS}" includes="NS.src.jar" />
 		</copy>
-		<copy todir="${Add_on_dir}/templates">
-			<fileset file="templates/NS.xml" />
-			<fileset file="templates/AutoPartition.xml" />
+		<copy todir="${Add_on_dir}/fxtemplates">
+			<fileset file="fxtemplates/NS.xml" />
 		</copy>
 
-		<jar jarfile="${distNS}/NS.addon.v${version}.zip">
+		<jar jarfile="${distNS}/NS.addon.v${NSversion}.zip">
 			<fileset dir="${Add_on_dir}">
 				<include name="**/*" />
 			</fileset>
         </jar>
-		<echo message="Add-on version v${version} release is finished." />
+		<echo message="Add-on version v${NSversion} release is finished." />
 	</target>
 
 </project>
diff --git a/examples/NS_4taxa_NormalBirthRate.xml b/examples/NS_4taxa_NormalBirthRate.xml
index edc2f59..ada7abb 100644
--- a/examples/NS_4taxa_NormalBirthRate.xml
+++ b/examples/NS_4taxa_NormalBirthRate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><beast beautitemplate='Standard' beautistatus='' namespace="beast.core:beast.evolution.alignment:beast.evolution.tree.coalescent:beast.core.util:beast.evolution.nuc:beast.evolution.operators:beast.evolution.sitemodel:beast.evolution.substitutionmodel:beast.evolution.likelihood" required="" version="2.5">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><beast beautitemplate='Standard' beautistatus='' namespace="beast.pkgmgmt:beast.base.core:beast.base.inference:beast.base.evolution.alignment:beast.base.evolution.tree.coalescent:beast.pkgmgmt:beast.base.core:beast.base.inference.util:beast.evolution.nuc:beast.base.evolution.operator:beast.base.inference.operator:beast.base.evolution.sitemodel:beast.base.evolution.substitutionmodel:beast.base.evolution.likelihood" required="" version="2.5">
 
 
     <data
@@ -34,16 +34,16 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
 
 
     
-<map name="Uniform" >beast.math.distributions.Uniform</map>
-<map name="Exponential" >beast.math.distributions.Exponential</map>
-<map name="LogNormal" >beast.math.distributions.LogNormalDistributionModel</map>
-<map name="Normal" >beast.math.distributions.Normal</map>
-<map name="Beta" >beast.math.distributions.Beta</map>
-<map name="Gamma" >beast.math.distributions.Gamma</map>
-<map name="LaplaceDistribution" >beast.math.distributions.LaplaceDistribution</map>
-<map name="prior" >beast.math.distributions.Prior</map>
-<map name="InverseGamma" >beast.math.distributions.InverseGamma</map>
-<map name="OneOnX" >beast.math.distributions.OneOnX</map>
+<map name="Uniform" >beast.base.inference.distribution.Uniform</map>
+<map name="Exponential" >beast.base.inference.distribution.Exponential</map>
+<map name="LogNormal" >beast.base.inference.distribution.LogNormalDistributionModel</map>
+<map name="Normal" >beast.base.inference.distribution.Normal</map>
+<map name="Beta" >beast.base.inference.distribution.Beta</map>
+<map name="Gamma" >beast.base.inference.distribution.Gamma</map>
+<map name="LaplaceDistribution" >beast.base.inference.distribution.LaplaceDistribution</map>
+<map name="prior" >beast.base.inference.distribution.Prior</map>
+<map name="InverseGamma" >beast.base.inference.distribution.InverseGamma</map>
+<map name="OneOnX" >beast.base.inference.distribution.OneOnX</map>
 
 
 <run id="mcmc" spec="beast.gss.NS" subChainLength="10000" chainLength="250000" preBurnin="0" particleCount="100" epsilon="1e-10"
@@ -62,22 +62,22 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
         <parameter id="freqParameter.s:dna" dimension="4" lower="0.0" name="stateNode" upper="1.0">0.25</parameter>
     </state>
 
-    <init id="RandomTree.t:dna" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:dna" taxa="@dna">
+    <init id="RandomTree.t:dna" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:dna" taxa="@dna">
         <populationModel id="ConstantPopulation0.t:dna" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:dna" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
-        <distribution id="prior" spec="util.CompoundDistribution">
-            <distribution id="YuleModel.t:dna" spec="beast.evolution.speciation.YuleModel" birthDiffRate="@birthRate.t:dna" tree="@Tree.t:dna"/>
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
+            <distribution id="YuleModel.t:dna" spec="beast.base.evolution.speciation.YuleModel" birthDiffRate="@birthRate.t:dna" tree="@Tree.t:dna"/>
             <prior id="YuleBirthRatePrior.t:dna" name="distribution" x="@birthRate.t:dna">
-                <Normal name="distr" mean="6.5" sigma="0.1" spec="beast.math.distributions.Normal"/>
+                <Normal name="distr" mean="6.5" sigma="0.1" spec="beast.base.inference.distribution.Normal"/>
             </prior>
             <prior id="KappaPrior.s:dna" name="distribution" x="@kappa.s:dna">
                 <Normal id="LogNormalDistributionModel.0" name="distr" mean="2.5" sigma="0.1"/>
             </prior>
-            <distribution id="root.prior" spec="beast.math.distributions.MRCAPrior" monophyletic="true" tree="@Tree.t:dna">
+            <distribution id="root.prior" spec="beast.base.evolution.tree.MRCAPrior" monophyletic="true" tree="@Tree.t:dna">
                 <taxonset id="root" spec="TaxonSet">
                     <taxon id="Cow" spec="Taxon"/>
                     <taxon id="Human" spec="Taxon"/>
@@ -87,7 +87,7 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
                 <Normal name="distr" mean="0.19" sigma="0.05"/>
             </distribution>
         </distribution>
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
             <distribution id="treeLikelihood.dna" spec="ThreadedTreeLikelihood" data="@dna" tree="@Tree.t:dna">
                 <siteModel id="SiteModel.s:dna" spec="SiteModel">
                     <parameter id="mutationRate.s:dna" estimate="false" name="mutationRate">1.0</parameter>
@@ -97,7 +97,7 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
                         <frequencies id="estimatedFreqs.s:dna" spec="Frequencies" frequencies="@freqParameter.s:dna"/>
                     </substModel>
                 </siteModel>
-                <branchRateModel id="StrictClock.c:dna" spec="beast.evolution.branchratemodel.StrictClockModel">
+                <branchRateModel id="StrictClock.c:dna" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                     <parameter id="clockRate.c:dna" estimate="false" name="clock.rate">1.0</parameter>
                 </branchRateModel>
             </distribution>
@@ -131,7 +131,7 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
         <log idref="likelihood"/>
         <log idref="prior"/>
         <log idref="treeLikelihood.dna"/>
-        <log id="TreeHeight.t:dna" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:dna"/>
+        <log id="TreeHeight.t:dna" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:dna"/>
         <log idref="YuleModel.t:dna"/>
         <log idref="birthRate.t:dna"/>
         <log idref="kappa.s:dna"/>
@@ -147,7 +147,7 @@ ML: -2349.814260249774 Information: 14.442480805674677 (SD ~ 0.12)
     </logger>
 
     <logger id="treelog.t:dna" fileName="$(tree).trees" logEvery="1000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:dna" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:dna"/>
+        <log id="TreeWithMetaDataLogger.t:dna" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:dna"/>
     </logger>
 
 
diff --git a/examples/dna.xml b/examples/dna.xml
index 7494f18..b0d3258 100644
--- a/examples/dna.xml
+++ b/examples/dna.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><beast beautitemplate='Standard' beautistatus='' namespace="beast.core:beast.evolution.alignment:beast.evolution.tree.coalescent:beast.core.util:beast.evolution.nuc:beast.evolution.operators:beast.evolution.sitemodel:beast.evolution.substitutionmodel:beast.evolution.likelihood" required="" version="2.4">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><beast beautitemplate='Standard' beautistatus='' namespace="beast.pkgmgmt:beast.base.core:beast.base.inference:beast.base.evolution.alignment:beast.base.evolution.tree.coalescent:beast.pkgmgmt:beast.base.core:beast.base.inference.util:beast.evolution.nuc:beast.base.evolution.operator:beast.base.inference.operator:beast.base.evolution.sitemodel:beast.base.evolution.substitutionmodel:beast.base.evolution.likelihood" required="" version="2.4">
 
 
     <data
@@ -24,16 +24,16 @@ name="alignment">
 
 
     
-<map name="Uniform" >beast.math.distributions.Uniform</map>
-<map name="Exponential" >beast.math.distributions.Exponential</map>
-<map name="LogNormal" >beast.math.distributions.LogNormalDistributionModel</map>
-<map name="Normal" >beast.math.distributions.Normal</map>
-<map name="Beta" >beast.math.distributions.Beta</map>
-<map name="Gamma" >beast.math.distributions.Gamma</map>
-<map name="LaplaceDistribution" >beast.math.distributions.LaplaceDistribution</map>
-<map name="prior" >beast.math.distributions.Prior</map>
-<map name="InverseGamma" >beast.math.distributions.InverseGamma</map>
-<map name="OneOnX" >beast.math.distributions.OneOnX</map>
+<map name="Uniform" >beast.base.inference.distribution.Uniform</map>
+<map name="Exponential" >beast.base.inference.distribution.Exponential</map>
+<map name="LogNormal" >beast.base.inference.distribution.LogNormalDistributionModel</map>
+<map name="Normal" >beast.base.inference.distribution.Normal</map>
+<map name="Beta" >beast.base.inference.distribution.Beta</map>
+<map name="Gamma" >beast.base.inference.distribution.Gamma</map>
+<map name="LaplaceDistribution" >beast.base.inference.distribution.LaplaceDistribution</map>
+<map name="prior" >beast.base.inference.distribution.Prior</map>
+<map name="InverseGamma" >beast.base.inference.distribution.InverseGamma</map>
+<map name="OneOnX" >beast.base.inference.distribution.OneOnX</map>
 
 
 <!-- stepping stone 
@@ -56,20 +56,20 @@ name="alignment">
         <parameter id="birthRate.t:dna" name="stateNode">1.0</parameter>
     </state>
 
-    <init id="RandomTree.t:dna" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:dna" taxa="@dna">
+    <init id="RandomTree.t:dna" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:dna" taxa="@dna">
         <populationModel id="ConstantPopulation0.t:dna" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:dna" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
-        <distribution id="prior" spec="util.CompoundDistribution">
-            <distribution id="YuleModel.t:dna" spec="beast.evolution.speciation.YuleModel" birthDiffRate="@birthRate.t:dna" tree="@Tree.t:dna"/>
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
+            <distribution id="YuleModel.t:dna" spec="beast.base.evolution.speciation.YuleModel" birthDiffRate="@birthRate.t:dna" tree="@Tree.t:dna"/>
             <prior id="YuleBirthRatePrior.t:dna" name="distribution" x="@birthRate.t:dna">
                 <Uniform id="Uniform.1" name="distr" upper="10"/>
             </prior>
         </distribution>
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
             <distribution id="treeLikelihood.dna" spec="ThreadedTreeLikelihood" data="@dna" tree="@Tree.t:dna">
                 <siteModel id="SiteModel.s:dna" spec="SiteModel">
                     <parameter id="mutationRate.s:dna" estimate="false" name="mutationRate">1.0</parameter>
@@ -77,7 +77,7 @@ name="alignment">
                     <parameter id="proportionInvariant.s:dna" estimate="false" lower="0.0" name="proportionInvariant" upper="1.0">0.0</parameter>
                     <substModel id="JC69.s:dna" spec="JukesCantor"/>
                 </siteModel>
-                <branchRateModel id="StrictClock.c:dna" spec="beast.evolution.branchratemodel.StrictClockModel">
+                <branchRateModel id="StrictClock.c:dna" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                     <parameter id="clockRate.c:dna" estimate="false" name="clock.rate">1.0</parameter>
                 </branchRateModel>
             </distribution>
@@ -105,7 +105,7 @@ name="alignment">
         <log idref="likelihood"/>
         <log idref="prior"/>
         <log idref="treeLikelihood.dna"/>
-        <log id="TreeHeight.t:dna" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:dna"/>
+        <log id="TreeHeight.t:dna" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:dna"/>
         <log idref="YuleModel.t:dna"/>
         <log idref="birthRate.t:dna"/>
     </logger>
@@ -118,7 +118,7 @@ name="alignment">
     </logger>
 
     <logger id="treelog.t:dna" fileName="$(tree).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:dna" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:dna"/>
+        <log id="TreeWithMetaDataLogger.t:dna" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:dna"/>
     </logger>
 
 </run>
diff --git a/templates/NS.xml b/fxtemplates/NS.xml
similarity index 85%
rename from templates/NS.xml
rename to fxtemplates/NS.xml
index 8b29670..eec89ef 100644
--- a/templates/NS.xml
+++ b/fxtemplates/NS.xml
@@ -1,5 +1,5 @@
 <beast version='2.0'
-       namespace='beast.app.beauti:beast.core:beast.evolution.branchratemodel:beast.evolution.speciation:beast.evolution.tree.coalescent:beast.core.util:beast.evolution.nuc:beast.evolution.operators:beast.evolution.sitemodel:beast.evolution.substitutionmodel:beast.evolution.likelihood:beast.evolution:beast.math.distributions'
+       namespace='beast.app.beauti:beast.pkgmgmt:beast.base.core:beast.base.inference:beast.base.evolution.branchratemodel:beast.base.evolution.speciation:beast.base.evolution.tree.coalescent:beast.base.util:beast.base.math:beast.evolution.nuc:beast.base.evolution.operator:beast.base.inference.operator:beast.base.evolution.sitemodel:beast.base.evolution.substitutionmodel:beast.base.evolution.likelihood:beast.evolution:beast.base.inference.distribution'
 	templateinfo='template for standard phylogenetic analysis,&lt;br> supporting tip-date analysis and calibrations'>
 
 <!--
@@ -26,7 +26,7 @@
             </distribution>
         </distribution>
 
-        <logger id='tracelog' spec="beast.core.Logger" logEvery="1000" fileName="beast.log" sort="smart" sanitiseHeaders='true'>
+        <logger id='tracelog' spec="beast.base.inference.Logger" logEvery="1000" fileName="beast.log" sort="smart" sanitiseHeaders='true'>
 	        <model idref='posterior'/>
             <log idref="posterior"/>
             <log idref="likelihood"/>
@@ -82,7 +82,7 @@ java -cp $(java.class.path) beast.app.beastapp.BeastMain $(resume/overwrite) -ja
 </subtemplate>
 
 
-        <subtemplate id='MCMC' class='beast.core.MCMC' mainid='mcmc'>
+        <subtemplate id='MCMC' class='beast.base.inference.MCMC' mainid='mcmc'>
 <![CDATA[
     <run spec="MCMC" id="mcmc" chainLength="1000000">
 
diff --git a/src/nestedsampling/core/NSLogger.java b/src/nestedsampling/core/NSLogger.java
index 575b25a..2b13b54 100644
--- a/src/nestedsampling/core/NSLogger.java
+++ b/src/nestedsampling/core/NSLogger.java
@@ -6,10 +6,10 @@
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
-import beast.core.Description;
-import beast.core.Loggable;
-import beast.core.Logger;
-import beast.util.XMLProducer;
+import beast.base.core.Description;
+import beast.base.core.Loggable;
+import beast.base.inference.Logger;
+import beast.base.parser.XMLProducer;
 
 @Description("Trace logger that logs NSLikelihood as second column (used by NSLogAnalyser to prodoce posterior sample)")
 public class NSLogger extends Logger {
diff --git a/src/nestedsampling/core/NSOperatorSchedule.java b/src/nestedsampling/core/NSOperatorSchedule.java
index 5379088..fae70d0 100644
--- a/src/nestedsampling/core/NSOperatorSchedule.java
+++ b/src/nestedsampling/core/NSOperatorSchedule.java
@@ -4,14 +4,19 @@
 import java.util.Arrays;
 import java.util.List;
 
-import beast.core.*;
-import beast.core.Input.Validate;
-import beast.core.parameter.Parameter;
-import beast.core.util.Log;
-import beast.evolution.operators.TipDatesRandomWalker;
-import beast.evolution.operators.TipDatesScaler;
-import beast.evolution.tree.TreeInterface;
-import beast.util.Randomizer;
+import beast.base.core.BEASTInterface;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.core.Input.Validate;
+import beast.base.inference.Operator;
+import beast.base.inference.OperatorSchedule;
+import beast.base.inference.StateNode;
+import beast.base.inference.parameter.Parameter;
+import beast.base.core.Log;
+import beast.base.evolution.operator.TipDatesRandomWalker;
+import beast.base.evolution.operator.TipDatesScaler;
+import beast.base.evolution.tree.TreeInterface;
+import beast.base.util.Randomizer;
 
 @Description("Operator scedule that automatically determines operator weights")
 public class NSOperatorSchedule extends OperatorSchedule {
diff --git a/src/nestedsampling/evolution/speciation/YuleModelNormalised.java b/src/nestedsampling/evolution/speciation/YuleModelNormalised.java
index 2c292b1..0f3a375 100644
--- a/src/nestedsampling/evolution/speciation/YuleModelNormalised.java
+++ b/src/nestedsampling/evolution/speciation/YuleModelNormalised.java
@@ -4,15 +4,15 @@
 
 import org.apache.commons.math3.util.FastMath;
 
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.Input.Validate;
-import beast.core.State;
-import beast.core.parameter.RealParameter;
-import beast.evolution.alignment.Alignment;
-import beast.evolution.tree.Node;
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.TreeDistribution;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.core.Input.Validate;
+import beast.base.inference.State;
+import beast.base.inference.parameter.RealParameter;
+import beast.base.evolution.alignment.Alignment;
+import beast.base.evolution.tree.Node;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeDistribution;
 import test.beast.BEASTTestCase;
 
 
diff --git a/src/nestedsampling/gss/DynamicNestedSampling.java b/src/nestedsampling/gss/DynamicNestedSampling.java
index ee80114..0043974 100644
--- a/src/nestedsampling/gss/DynamicNestedSampling.java
+++ b/src/nestedsampling/gss/DynamicNestedSampling.java
@@ -11,14 +11,14 @@
 
 import org.xml.sax.SAXException;
 
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.Logger;
-import beast.core.Operator;
-import beast.core.State;
-import beast.core.util.CompoundDistribution;
-import beast.core.util.Log;
-import beast.evolution.tree.TreeInterface;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.inference.Logger;
+import beast.base.inference.Operator;
+import beast.base.inference.State;
+import beast.base.inference.CompoundDistribution;
+import beast.base.core.Log;
+import beast.base.evolution.tree.TreeInterface;
 import nestedsampling.core.NSLogger;
 import nestedsampling.util.NSLogAnalyser;
 
diff --git a/src/nestedsampling/gss/MultiThreadedNS.java b/src/nestedsampling/gss/MultiThreadedNS.java
index ad74106..68ccd4c 100644
--- a/src/nestedsampling/gss/MultiThreadedNS.java
+++ b/src/nestedsampling/gss/MultiThreadedNS.java
@@ -11,12 +11,12 @@
 
 import org.xml.sax.SAXException;
 
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.util.Log;
-import beast.util.XMLParser;
-import beast.util.XMLParserException;
-import beast.util.XMLProducer;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.core.Log;
+import beast.base.parser.XMLParser;
+import beast.base.parser.XMLParserException;
+import beast.base.parser.XMLProducer;
 
 @Description("Multi threaded nested sampling")
 public class MultiThreadedNS extends NS {
diff --git a/src/nestedsampling/gss/NIS.java b/src/nestedsampling/gss/NIS.java
index dab7fde..e89a6c8 100644
--- a/src/nestedsampling/gss/NIS.java
+++ b/src/nestedsampling/gss/NIS.java
@@ -11,24 +11,24 @@
 
 import org.xml.sax.SAXException;
 
-import beast.core.Citation;
-import beast.core.Description;
-import beast.core.Distribution;
-import beast.core.Input;
-import beast.core.Input.Validate;
-import beast.core.Logger;
-import beast.core.MCMC;
-import beast.core.Operator;
-import beast.core.State;
-import beast.core.StateNode;
-import beast.core.StateNodeInitialiser;
-import beast.core.parameter.Parameter;
-import beast.core.util.CompoundDistribution;
-import beast.core.util.Evaluator;
-import beast.core.util.Log;
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.TreeInterface;
-import beast.util.Randomizer;
+import beast.base.core.Citation;
+import beast.base.core.Description;
+import beast.base.inference.Distribution;
+import beast.base.core.Input;
+import beast.base.core.Input.Validate;
+import beast.base.inference.Logger;
+import beast.base.inference.MCMC;
+import beast.base.inference.Operator;
+import beast.base.inference.State;
+import beast.base.inference.StateNode;
+import beast.base.inference.StateNodeInitialiser;
+import beast.base.inference.parameter.Parameter;
+import beast.base.inference.CompoundDistribution;
+import beast.base.inference.Evaluator;
+import beast.base.core.Log;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeInterface;
+import beast.base.util.Randomizer;
 import nestedsampling.core.NSLogger;
 import nestedsampling.util.NSLogAnalyser;
 
@@ -732,7 +732,7 @@ public static double logPlus(double x, double y) {
 	 * 
 	 * @param currState
 	 *            the current state
-	 * @return the selected {@link beast.core.Operator}
+	 * @return the selected {@link beast.base.inference.Operator}
 	 */
 	protected boolean composeProposal(final int currState) {
 		boolean accept = false;
@@ -835,7 +835,7 @@ public double evaluate() {
 
 
 	@Description("Takes weighted mixture of distributions")
-	public class MixtureDistribution extends beast.core.Distribution {
+	public class MixtureDistribution extends beast.base.inference.Distribution {
 		public Input<Distribution> d1Input = new Input<>("d1","first of two distributions", Validate.REQUIRED);
 		public Input<Distribution> d2Input = new Input<>("d2","second of two distributions", Validate.REQUIRED);
 
diff --git a/src/nestedsampling/gss/NS.java b/src/nestedsampling/gss/NS.java
index 3b70088..a0b04d7 100644
--- a/src/nestedsampling/gss/NS.java
+++ b/src/nestedsampling/gss/NS.java
@@ -1,7 +1,7 @@
 package nestedsampling.gss;
 
 
-import java.io.File;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -12,24 +12,23 @@
 
 import org.xml.sax.SAXException;
 
-import beast.app.beauti.Beauti;
-import beast.core.Citation;
-import beast.core.Description;
-import beast.core.Distribution;
-import beast.core.Input;
-import beast.core.Logger;
-import beast.core.MCMC;
-import beast.core.Operator;
-import beast.core.State;
-import beast.core.StateNode;
-import beast.core.StateNodeInitialiser;
-import beast.core.parameter.Parameter;
-import beast.core.util.CompoundDistribution;
-import beast.core.util.Evaluator;
-import beast.core.util.Log;
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.TreeInterface;
-import beast.util.Randomizer;
+import beast.base.core.Citation;
+import beast.base.core.Description;
+import beast.base.inference.Distribution;
+import beast.base.core.Input;
+import beast.base.inference.Logger;
+import beast.base.inference.MCMC;
+import beast.base.inference.Operator;
+import beast.base.inference.State;
+import beast.base.inference.StateNode;
+import beast.base.inference.StateNodeInitialiser;
+import beast.base.inference.parameter.Parameter;
+import beast.base.inference.CompoundDistribution;
+import beast.base.inference.Evaluator;
+import beast.base.core.Log;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeInterface;
+import beast.base.util.Randomizer;
 import nestedsampling.core.NSLogger;
 import nestedsampling.util.NSLogAnalyser;
 
@@ -907,7 +906,7 @@ public static double logPlus(double x, double y) {
 	 * 
 	 * @param currState
 	 *            the current state
-	 * @return the selected {@link beast.core.Operator}
+	 * @return the selected {@link beast.base.inference.Operator}
 	 */
 	protected boolean composeProposal(final int currState) {
 		boolean accept = false;
diff --git a/src/nestedsampling/gss/NSThread.java b/src/nestedsampling/gss/NSThread.java
index 3d69e2b..7654fef 100644
--- a/src/nestedsampling/gss/NSThread.java
+++ b/src/nestedsampling/gss/NSThread.java
@@ -6,9 +6,9 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import beast.core.Description;
-import beast.core.Distribution;
-import beast.util.Randomizer;
+import beast.base.core.Description;
+import beast.base.inference.Distribution;
+import beast.base.util.Randomizer;
 
 @Description("class for performing a one-threaded NS as part of MultiThreadedNS")
 public class NSThread extends NS {
diff --git a/src/nestedsampling/util/MCMC2NIS.java b/src/nestedsampling/util/MCMC2NIS.java
index d99757a..228751a 100644
--- a/src/nestedsampling/util/MCMC2NIS.java
+++ b/src/nestedsampling/util/MCMC2NIS.java
@@ -1,11 +1,11 @@
 package nestedsampling.util;
 
-import beast.app.util.Application;
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.MCMC;
-import beast.core.Runnable;
+import beastfx.app.tools.Application;
 import modelselection.gss.MCMC2IS;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.inference.MCMC;
+import beast.base.inference.Runnable;
 import nestedsampling.gss.NS;
 
 @Description("Convert MCMC analysis to nested importance sampling analysis and optionally run the analysis")
diff --git a/src/nestedsampling/util/MCMC2NS.java b/src/nestedsampling/util/MCMC2NS.java
index 29c4551..767c0da 100644
--- a/src/nestedsampling/util/MCMC2NS.java
+++ b/src/nestedsampling/util/MCMC2NS.java
@@ -7,20 +7,20 @@
 
 import org.xml.sax.SAXException;
 
-import beast.app.util.Application;
-import beast.app.util.OutFile;
-import beast.app.util.XMLFile;
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.MCMC;
-import beast.core.OperatorSchedule;
-import beast.core.Runnable;
-import beast.core.Input.Validate;
-import beast.core.Logger;
-import beast.core.util.Log;
-import beast.util.XMLParser;
-import beast.util.XMLParserException;
-import beast.util.XMLProducer;
+import beastfx.app.tools.Application;
+import beastfx.app.util.OutFile;
+import beastfx.app.util.XMLFile;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.inference.MCMC;
+import beast.base.inference.OperatorSchedule;
+import beast.base.inference.Runnable;
+import beast.base.core.Input.Validate;
+import beast.base.inference.Logger;
+import beast.base.core.Log;
+import beast.base.parser.XMLParser;
+import beast.base.parser.XMLParserException;
+import beast.base.parser.XMLProducer;
 import nestedsampling.gss.NS;
 
 @Description("Convert MCMC analysis to nested sampling analysis")
diff --git a/src/nestedsampling/util/NSLogAnalyser.java b/src/nestedsampling/util/NSLogAnalyser.java
index b1ab8da..0ea9655 100644
--- a/src/nestedsampling/util/NSLogAnalyser.java
+++ b/src/nestedsampling/util/NSLogAnalyser.java
@@ -1,7 +1,7 @@
 package nestedsampling.util;
 
 
-import static beast.util.OutputUtils.format;
+import static beast.base.parser.OutputUtils.format;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,18 +14,15 @@
 import org.apache.commons.math.distribution.BetaDistribution;
 import org.apache.commons.math.distribution.BetaDistributionImpl;
 
-import beast.app.BEASTVersion2;
-import beast.app.treeannotator.TreeAnnotator;
-import beast.app.util.Application;
-import beast.app.util.LogFile;
-import beast.app.util.OutFile;
-import beast.app.util.Utils;
-import beast.core.Input;
-import beast.core.Runnable;
-import beast.core.Input.Validate;
-import beast.core.util.Log;
-import beast.evolution.tree.Tree;
-import beast.util.*;
+import beast.base.core.BEASTVersion2;
+import beastfx.app.treeannotator.TreeAnnotator;
+import beastfx.app.tools.Application;
+import beastfx.app.tools.LogAnalyser;
+import beastfx.app.util.Utils;
+import beast.base.parser.OutputUtils;
+import beast.base.util.Randomizer;
+import beast.base.core.Log;
+import beast.base.evolution.tree.Tree;
 import nestedsampling.gss.NS;
 
 public class NSLogAnalyser extends LogAnalyser {
@@ -402,7 +399,7 @@ static void writeFile(PrintStream out, int [] entryCount, String [] m_sLabels, D
 
 		} else {
 			// resample tree file
-			beast.app.treeannotator.TreeAnnotator.MemoryFriendlyTreeSet treeset = new TreeAnnotator().new MemoryFriendlyTreeSet(treeFile, 0);
+			TreeAnnotator.MemoryFriendlyTreeSet treeset = new TreeAnnotator().new MemoryFriendlyTreeSet(treeFile, 0);
 			treeset.reset();
 			Tree tree = treeset.next();
 			tree.init(out);
diff --git a/src/nestedsampling/util/NSLogAnalyserGUI.java b/src/nestedsampling/util/NSLogAnalyserGUI.java
index 967a0b3..1535e0e 100644
--- a/src/nestedsampling/util/NSLogAnalyserGUI.java
+++ b/src/nestedsampling/util/NSLogAnalyserGUI.java
@@ -3,12 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import beast.app.util.LogFile;
-import beast.app.util.OutFile;
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.Runnable;
-import beast.core.Input.Validate;
+import beastfx.app.util.LogFile;
+import beastfx.app.util.OutFile;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.inference.Runnable;
+import beast.base.core.Input.Validate;
 
 @Description("GUI wrapper for NSLogAnalyser")
 public class NSLogAnalyserGUI extends Runnable {
diff --git a/src/test/beast/gss/integration/NS4TaxaTest.java b/src/test/beast/gss/integration/NS4TaxaTest.java
index 83c2195..c7a5f69 100644
--- a/src/test/beast/gss/integration/NS4TaxaTest.java
+++ b/src/test/beast/gss/integration/NS4TaxaTest.java
@@ -9,10 +9,10 @@
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import beast.core.Logger;
-import beast.util.Randomizer;
-import beast.util.XMLParser;
-import beast.util.XMLParserException;
+import beast.base.inference.Logger;
+import beast.base.util.Randomizer;
+import beast.base.parser.XMLParser;
+import beast.base.parser.XMLParserException;
 import junit.framework.TestCase;
 import nestedsampling.gss.NS;
 
@@ -27,7 +27,7 @@ public void testNS4Taxa() throws SAXException, IOException, ParserConfigurationE
         Randomizer.setSeed(seed);
         System.out.println("Processing " + fileName);
         XMLParser parser = new XMLParser();
-        beast.core.Runnable runable = parser.parseFile(new File(fileName));
+        beast.base.inference.Runnable runable = parser.parseFile(new File(fileName));
         if (runable instanceof NS) {
             NS ns = (NS) runable;
             ns.run();
diff --git a/src/test/beast/gss/integration/XMLParsingTest.java b/src/test/beast/gss/integration/XMLParsingTest.java
index 603786e..5a80cf0 100644
--- a/src/test/beast/gss/integration/XMLParsingTest.java
+++ b/src/test/beast/gss/integration/XMLParsingTest.java
@@ -1,6 +1,7 @@
 package test.beast.gss.integration;
 
-import test.beast.integration.ExampleXmlParsingTest;
+import test.beastfx.integration.ExampleXmlParsingTest;
+
 
 public class XMLParsingTest extends ExampleXmlParsingTest {
 
diff --git a/version.xml b/version.xml
index 3e85d15..22e3020 100644
--- a/version.xml
+++ b/version.xml
@@ -1,7 +1,7 @@
 <package name='NS' version='1.1.0'>
-	<depends on='beast2' atleast='2.6.0'/>
-	<depends on='BEASTLabs' atleast='1.9.0'/>
-	<depends on='MODEL_SELECTION' atleast='1.5.0'/>
+  <depends on='BEAST.base' atleast='2.7.0'/>
+  <depends on='BEAST.app' atleast='2.7.0'/>
+	<depends on='MODEL_SELECTION' atleast='1.6.0'/>
 
     <packageapp description="Nested Sampling Log Analyser"
               class="nestedsampling.util.NSLogAnalyser"
@@ -29,4 +29,19 @@
 			<map from="beast.evolution.speciation.YuleModelNormalised" to="nestedsampling.evolution.speciation.YuleModelNormalised"/>
 
 
+    <service type="beast.base.core.BEASTInterface">
+        <provider classname="nestedsampling.core.NSLogger"/>
+        <provider classname="nestedsampling.core.NSOperatorSchedule"/>
+        <provider classname="nestedsampling.evolution.speciation.YuleModelNormalised"/>
+        <provider classname="nestedsampling.gss.DynamicNestedSampling"/>
+        <provider classname="nestedsampling.gss.MultiThreadedNS"/>
+        <provider classname="nestedsampling.gss.NIS"/>
+        <provider classname="nestedsampling.gss.NS"/>
+        <provider classname="nestedsampling.gss.NSThread"/>
+        <provider classname="nestedsampling.util.MCMC2NIS"/>
+        <provider classname="nestedsampling.util.MCMC2NS"/>
+        <provider classname="nestedsampling.util.NSLogAnalyserGUI"/>
+    </service>
+
+
 </package>