diff --git a/Dockerfile b/Dockerfile
index 2ce36b8..890cc9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Dockerfile to build container for unit testing
 
-FROM openjdk:10
+FROM openjdk:17
 
 RUN apt-get update && apt-get install -y git ant
 
diff --git a/README.md b/README.md
index 096a951..b451555 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ KV Parag, L du Plessis, OG Pybus. _Jointly inferring the dynamics of population
 
 To install BESP:
 
-1. Download and install [BEAST2](www.beast2.org) (at least version 2.5.0).
+1. Download and install [BEAST2](www.beast2.org) (at least version 2.7.0).
 2. Launch the BEAUti application distributed with BEAST2.
 3. From the File menu select "Manage Packages".
 4. Click the "Package repositories" button at the bottom of the Package Manager dialog box.
@@ -26,7 +26,7 @@ To install BESP:
 
 To build this package from source, ensure that  you have the following installed:
 
-- Java JDK v1.8
+- Java JDK v17
 - Apache Ant v1.9 or later
 - An internet connection
 
diff --git a/ScreenShotIntelliJ.png b/ScreenShotIntelliJ.png
new file mode 100644
index 0000000..59d0612
Binary files /dev/null and b/ScreenShotIntelliJ.png differ
diff --git a/build.xml b/build.xml
index 5e68e46..2cdcc7a 100644
--- a/build.xml
+++ b/build.xml
@@ -7,15 +7,16 @@
 
     <!-- Location to check for local copy of beast2 repository -->
     <property name="beastDir" location="../beast2"/>
+    <property name="BeastFXpath" location="../BeastFX" />
 
-    <!-- BEAST 2 currently uses Java 1.8 -->
-    <property name="sourceVersion" value="1.8"/>
-    <property name="targetVersion" value="1.8"/>
+    <!-- BEAST 2 currently uses Java 17 -->
+    <property name="sourceVersion" value="17"/>
+    <property name="targetVersion" value="17"/>
 
     <!-- Directories necessary for all BEAST 2 packages -->
     <property name="doc" location="doc"/>
     <property name="examples" location="examples"/>
-    <property name="templates" location="templates"/>
+    <property name="templates" location="fxtemplates"/>
 
     <!-- BEAST branch and version to build against
          (only different for version tags because of
@@ -44,15 +45,18 @@
 
         <!-- Read package name and version from xml file -->
         <xmlproperty file="version.xml" prefix="fromVersionFile" />
-        <property name="projName" value="${fromVersionFile.addon(name)}" />
-        <property name="projVersion" value="${fromVersionFile.addon(version)}" />
+        <property name="projName" value="${fromVersionFile.package(name)}" />
+        <property name="projVersion" value="${fromVersionFile.package(version)}" />
 
         <mkdir dir="${build}"/>
         <mkdir dir="${build-lib}"/>
         <mkdir dir="${dist}"/>
 
-        <copy todir="${build-lib}" failonerror="false" quiet="true">
-            <fileset dir="${lib}" includes="*.jar"/>
+        <copy todir="${build-lib}">
+<!--            <fileset dir="${lib}" includes="*.jar"/>-->
+            <fileset dir="${beastDir}/lib" includes="*.jar"/>
+            <fileset dir="${beastDir}/lib/junit" includes="junit-*.jar"/>
+            <fileset dir="${BeastFXpath}/locallib" includes="*.jar"/>
         </copy>
     </target>
 
@@ -65,7 +69,7 @@
     <target name="build-remote-beast" depends="find-beast" unless="localBeastAvailable">
         <echo>No local copy of the beast2 source found at ${beastDir}.</echo>
         <echo>Compiling against version ${beast-version} from GitHub.</echo>
-
+        <!--  TODO not tested    -->
         <property name="build-beast" location="build-beast"/>
         <mkdir dir="${build-beast}"/>
 
@@ -80,10 +84,41 @@
                 <fileset dir="${build-beast}/beast2-${beast-version}/lib" includes="*.jar"/>
             </classpath>
         </javac>
-        <jar jarfile="${build-lib}/beast2.jar" basedir="${build-beast}/beast2-${beast-version}/build" />
+
+        <mkdir dir="${build-beast}/beast2-${beast-version}/test"/>
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${build-beast}/beast2-${beast-version}/test"
+               destdir="${build-beast}/beast2-${beast-version}/build"
+               includeantruntime="false">
+            <classpath>
+                <pathelement path="${classpath}"/>
+                <fileset dir="${build-beast}/beast2-${beast-version}/lib" includes="*.jar"/>
+                <fileset dir="${beastDir}/lib/junit" includes="junit-*.jar"/>
+            </classpath>
+        </javac>
+
         <copy todir="${build-lib}">
             <fileset dir="${build-beast}/beast2-${beast-version}/lib" includes="*.jar"/>
+            <fileset dir="${beastDir}/lib/junit" includes="junit-*.jar"/>
         </copy>
+        <jar jarfile="${build-lib}/beast2.jar" basedir="${build-beast}/beast2-${beast-version}/build" />
+
+        <get src="https://github.com/CompEvol/BeastFX/archive/${beast-branch}.zip" dest="${build-beast}/beastFX.zip"/>
+        <unzip src="${build-beast}/beastFX.zip" dest="${build-beast}"/>
+        <mkdir dir="${build-beast}/beastFX-${beast-version}/build"/>
+        <!-- Java FX  -->
+        <!-- if Zulu is not installed, it can specify javac, e.g. add  -->
+        <!-- executable="../../Downloads/zulu17.36.13-ca-fx-jdk17.0.4-macosx_x64/bin/javac"  -->
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${build-beast}/beastFX-${beast-version}/src"
+               destdir="${build-beast}/beastFX-${beast-version}/build"
+               fork="true"  includeantruntime="false">
+            <classpath>
+                <pathelement path="${classpath}"/>
+                <fileset dir="${build-lib}" includes="*.jar"/>
+            </classpath>
+        </javac>
+        <jar jarfile="${build-lib}/beastFX.jar" basedir="${build-beast}/beastFX-${beast-version}/build" />
 
         <delete dir="${build-beast}" />
     </target>
@@ -95,21 +130,36 @@
         <mkdir dir="${build-beast}"/>
 
         <javac target="${targetVersion}" source="${sourceVersion}"
-            srcdir="${beastDir}/src"
-            destdir="${build-beast}" includeantruntime="false">
+               srcdir="${beastDir}/src" destdir="${build-beast}"
+               includeantruntime="false">
             <classpath>
                 <pathelement path="${classpath}"/>
                 <fileset dir="${beastDir}/lib" includes="*.jar"/>
             </classpath>
         </javac>
+        <!-- for testing -->
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${beastDir}/test" destdir="${build-beast}"
+               includeantruntime="false">
+            <classpath>
+                <pathelement path="${classpath}"/>
+                <fileset dir="${build-lib}" includes="*.jar"/>
+            </classpath>
+        </javac>
+
+        <!-- Java FX  -->
+        <!-- if Zulu is not installed, it can specify javac, e.g. add  -->
+        <!-- executable="../../Downloads/zulu17.36.13-ca-fx-jdk17.0.4-macosx_x64/bin/javac"  -->
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${BeastFXpath}/src" destdir="${build-beast}"
+               fork="true"  includeantruntime="false">
+            <classpath>
+                <pathelement path="${classpath}"/>
+                <fileset dir="${build-lib}" includes="*.jar"/>
+            </classpath>
+        </javac>
+
         <jar jarfile="${build-lib}/beast2.jar" basedir="${build-beast}" />
-        <copy todir="${build-lib}">
-            <fileset dir="${beastDir}/lib" includes="*.jar"/>
-        </copy>
-        <copy todir="${build}">
-            <fileset dir="${beastDir}/src"
-                     includes="**/*.png" />
-        </copy>
 
         <delete dir="${build-beast}" />
     </target>
@@ -123,7 +173,9 @@
 
     <!-- Compile -->
     <target name="compile" depends="build-beast, get-dependencies">
-        <javac target="${targetVersion}" source="${sourceVersion}" srcdir="${src}" destdir="${build}" includeantruntime="false">
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${src}" destdir="${build}"
+               includeantruntime="false">
             <classpath>
                 <pathelement path="${classpath}"/>
                 <fileset dir="${build-lib}" includes="*.jar"/>
@@ -144,10 +196,11 @@
         <mkdir dir="${test-reports}"/>
     </target>
 
-
     <!-- Compile unit tests -->
     <target name="compile-test" depends="init-test,compile,copy-resources">
-        <javac target="${targetVersion}" source="${sourceVersion}" srcdir="${test}" destdir="${build-test}" includeantruntime="false">
+        <javac target="${targetVersion}" source="${sourceVersion}"
+               srcdir="${test}" destdir="${build-test}"
+               includeantruntime="false">
             <classpath>
                 <pathelement path="${classpath}"/>
                 <pathelement path="${build}" />
@@ -186,7 +239,7 @@
 
         <mkdir dir="${pack}"/>
         <mkdir dir="${pack}/examples"/>
-        <mkdir dir="${pack}/templates"/>
+        <mkdir dir="${pack}/fxtemplates"/>
         <mkdir dir="${pack}/lib"/>
         <mkdir dir="${pack}/doc"/>
 
@@ -211,8 +264,8 @@
             <fileset dir="${examples}" includes="**/*.fasta" />
         </copy>
 
-        <mkdir dir="${templates}" />
-        <copy todir="${pack}/templates">
+        <mkdir dir="fxtemplates" />
+        <copy todir="${pack}/fxtemplates">
             <fileset dir="${templates}" includes="*.xml" />
         </copy>
 
diff --git a/examples/BESP/bison_besp_mcpgamma_limits_densdefined.xml b/examples/BESP/bison_besp_mcpgamma_limits_densdefined.xml
index 28d9803..7e33d21 100644
--- a/examples/BESP/bison_besp_mcpgamma_limits_densdefined.xml
+++ b/examples/BESP/bison_besp_mcpgamma_limits_densdefined.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
        beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.core.parameter
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
                  :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -181,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -367,24 +366,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BESP" popSizeGroupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013" minWidth="100" samplingIntensity="@bSamplingIntensity.t:bison_2013">
-                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Sampling Intensity Prior -->
             <prior id="SamplingIntensityPrior.t:bison_2013" name="distribution" x="@bSamplingIntensity.t:bison_2013">
@@ -404,7 +403,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -420,7 +419,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -476,7 +475,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/> 
@@ -493,7 +492,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BESP/bison_besp_mcpgamma_limits_freqdefined.xml b/examples/BESP/bison_besp_mcpgamma_limits_freqdefined.xml
index b0eb8a8..9dec0e8 100644
--- a/examples/BESP/bison_besp_mcpgamma_limits_freqdefined.xml
+++ b/examples/BESP/bison_besp_mcpgamma_limits_freqdefined.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.core.parameter
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -181,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -367,25 +366,25 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BESP" popSizeGroupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013" minWidth="100" samplingIntensity="@bSamplingIntensity.t:bison_2013">
                 <samplingEpochTimes id="EpochTimes" spec="RealParameter" dimension="11" value="500 5000 10000 15000 20000 25000 30000 35000 40000 45000 50000"/>
-                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Sampling Intensity Prior -->
             <prior id="SamplingIntensityPrior.t:bison_2013" name="distribution" x="@bSamplingIntensity.t:bison_2013">
@@ -405,7 +404,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -421,7 +420,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -477,7 +476,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/> 
@@ -494,7 +493,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BESP/bison_besp_mcpgamma_limits_robust.xml b/examples/BESP/bison_besp_mcpgamma_limits_robust.xml
index 089f401..e5a536b 100644
--- a/examples/BESP/bison_besp_mcpgamma_limits_robust.xml
+++ b/examples/BESP/bison_besp_mcpgamma_limits_robust.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.core.parameter
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
-
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
     <data id="bison_2013" name="alignment">
         <sequence id="seq_BS100_29_5" taxon="BS100_29_5" totalcount="4" value="CAAAGCTGAAGTTCTATTTAAACTATTCCCTGAACGCTATTAATATAGTTCCATAAATGCAAAGAGCCTCACCAGTATTAAATTTACTAAAAATTCCAATAACTCAACACAAACTTTGTACTCTAACCAAATATTGCAAACACCACTAGCTAACGTCACTCACCCCCAAAA--TGCATTACCCAAACGGGGG-----AATATACATAACATTAATGTAATAAAAACATATTATGTATATAGTACATTAAATTATATGCCCCATGCATATAAGCAAGTACTTATCCTCTATTGATAGTACATAGTACATAAAGTTATTAATTGTACATAGCACATTATGTCAAATCTACCCTTGGCAACATGCATATCCCTT-CCACTAGATCACGAGCTTAATTACCATGCCGCGTGAAACCAGCAACCCGCTAGGCAGAGGATCCCTCTTCTCGCTCCGGGCCCATGAACCGTGGGGGTCGCTATTTAATGAATTTTATCAGACATCTGGTTCTTTCTTCAGGGCCATCTCACCTAGAATCGCCCATTCTTTCCTCTTAAATAAGACATCTCGATGGACTAATGGCTAATCAGCCCATGCTCACACATAAC"/>
@@ -181,23 +179,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -366,24 +364,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BESP" popSizes="@bPopSizes.t:bison_2013" minWidth="100" samplingIntensity="@bSamplingIntensity.t:bison_2013">
-                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Sampling Intensity Prior -->
             <prior id="SamplingIntensityPrior.t:bison_2013" name="distribution" x="@bSamplingIntensity.t:bison_2013">
@@ -403,7 +401,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -419,7 +417,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -471,7 +469,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/> 
         <log idref="bSamplingIntensity.t:bison_2013"/>
@@ -487,7 +485,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BESP/bison_besp_mcpgamma_robust.xml b/examples/BESP/bison_besp_mcpgamma_robust.xml
index e4c75fc..c30480a 100644
--- a/examples/BESP/bison_besp_mcpgamma_robust.xml
+++ b/examples/BESP/bison_besp_mcpgamma_robust.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.core.parameter
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -181,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -366,24 +365,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BESP" popSizes="@bPopSizes.t:bison_2013" samplingIntensity="@bSamplingIntensity.t:bison_2013">
-                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BESPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Sampling Intensity Prior -->
             <prior id="SamplingIntensityPrior.t:bison_2013" name="distribution" x="@bSamplingIntensity.t:bison_2013">
@@ -403,7 +402,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -419,7 +418,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -471,7 +470,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/> 
         <log idref="bSamplingIntensity.t:bison_2013"/>
@@ -487,7 +486,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/bison_bsp_mcpgamma.xml b/examples/BSP/bison_bsp_mcpgamma.xml
index 2f80211..3f233ff 100644
--- a/examples/BSP/bison_bsp_mcpgamma.xml
+++ b/examples/BSP/bison_bsp_mcpgamma.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -180,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -365,24 +365,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BSP" popSizeGroupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013">
-                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Site and clock model priors --> 
             <prior id="KappaPrior.s:bison_2013" name="distribution" x="@kappa.s:bison_2013">
@@ -397,7 +397,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -413,7 +413,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -467,7 +467,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/>        
@@ -481,7 +481,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/bison_bsp_mcpgamma_limits.xml b/examples/BSP/bison_bsp_mcpgamma_limits.xml
index 4144f03..1e222b0 100644
--- a/examples/BSP/bison_bsp_mcpgamma_limits.xml
+++ b/examples/BSP/bison_bsp_mcpgamma_limits.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -180,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -365,24 +365,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BSP" popSizeGroupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013" minWidth="100">
-                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Site and clock model priors --> 
             <prior id="KappaPrior.s:bison_2013" name="distribution" x="@kappa.s:bison_2013">
@@ -397,7 +397,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -413,7 +413,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -467,7 +467,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:bison_2013"/>        
@@ -481,7 +481,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/bison_bsp_mcpgamma_skylinecomparison.xml b/examples/BSP/bison_bsp_mcpgamma_skylinecomparison.xml
index 10b8255..408f479 100644
--- a/examples/BSP/bison_bsp_mcpgamma_skylinecomparison.xml
+++ b/examples/BSP/bison_bsp_mcpgamma_skylinecomparison.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
                  :bsp.distributions
-                 :bsp.util" 
-       required="BEAST v2.5.0" 
-       version="2.5">
-
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
     <data id="bison_2013" name="alignment">
         <sequence id="seq_BS100_29_5" taxon="BS100_29_5" totalcount="4" value="CAAAGCTGAAGTTCTATTTAAACTATTCCCTGAACGCTATTAATATAGTTCCATAAATGCAAAGAGCCTCACCAGTATTAAATTTACTAAAAATTCCAATAACTCAACACAAACTTTGTACTCTAACCAAATATTGCAAACACCACTAGCTAACGTCACTCACCCCCAAAA--TGCATTACCCAAACGGGGG-----AATATACATAACATTAATGTAATAAAAACATATTATGTATATAGTACATTAAATTATATGCCCCATGCATATAAGCAAGTACTTATCCTCTATTGATAGTACATAGTACATAAAGTTATTAATTGTACATAGCACATTATGTCAAATCTACCCTTGGCAACATGCATATCCCTT-CCACTAGATCACGAGCTTAATTACCATGCCGCGTGAAACCAGCAACCCGCTAGGCAGAGGATCCCTCTTCTCGCTCCGGGCCCATGAACCGTGGGGGTCGCTATTTAATGAATTTTATCAGACATCTGGTTCTTTCTTCAGGGCCATCTCACCTAGAATCGCCCATTCTTTCCTCTTAAATAAGACATCTCGATGGACTAATGGCTAATCAGCCCATGCTCACACATAAC"/>
@@ -180,23 +179,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -365,20 +364,20 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BayesianSkyline" groupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013">
-                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <distribution id="BayesianSkylineNew.t:bison_2013" spec="BSP" popSizeGroupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013">
@@ -387,7 +386,7 @@
 
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Site and clock model priors --> 
             <prior id="KappaPrior.s:bison_2013" name="distribution" x="@kappa.s:bison_2013">
@@ -402,7 +401,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -418,7 +417,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -473,7 +472,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
         <log id="bPopSizeChangeTimes.t:bison_2013" spec="popSizeChangeTimeLogger" skyline="@BayesianSkylineNew.t:bison_2013"/>        
@@ -487,7 +486,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/bison_bspold_mcpgamma.xml b/examples/BSP/bison_bspold_mcpgamma.xml
index 58932bc..69caf12 100644
--- a/examples/BSP/bison_bspold_mcpgamma.xml
+++ b/examples/BSP/bison_bspold_mcpgamma.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beast beautitemplate='Standard' 
-       beautistatus='' 
-       namespace="beast.core
-                 :beast.evolution.alignment
-                 :beast.evolution.tree.coalescent
-                 :beast.util
-                 :beast.core.util
-                 :beast.evolution.nuc
-                 :beast.evolution.operators
-                 :beast.evolution.sitemodel
-                 :beast.evolution.substitutionmodel
-                 :beast.evolution.likelihood" 
-       required="BEAST v2.5.0" 
-       version="2.5">
+       beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
 
 
     <data id="bison_2013" name="alignment">
@@ -178,23 +180,23 @@
 
 
     
-<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="MCMC" chainLength="20000000">
     <state id="state" storeEvery="50000000">
 
         <tree id="Tree.t:bison_2013" name="stateNode">
-            <trait id="dateTrait.t:bison_2013" spec="beast.evolution.tree.TraitSet" traitname="date-backward">
+            <trait id="dateTrait.t:bison_2013" spec="beast.base.evolution.tree.TraitSet" traitname="date-backward">
                 U12959_0_0=0,
                 U12958_0_0=0,
                 U12957_0_0=0,
@@ -363,24 +365,24 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:bison_2013" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
+    <init id="RandomTree.t:bison_2013" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:bison_2013" taxa="@bison_2013">
         <populationModel id="ConstantPopulation0.t:bison_2013" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:bison_2013" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
         <!-- Begin prior -->
-        <distribution id="prior" spec="util.CompoundDistribution">
+        <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
             <!-- Treeprior (Bayesian Skyline Plot) -->
             <distribution id="BayesianSkyline.t:bison_2013" spec="BayesianSkyline" groupSizes="@bGroupSizes.t:bison_2013" popSizes="@bPopSizes.t:bison_2013">
-                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="TreeIntervals" tree="@Tree.t:bison_2013"/>
+                <treeIntervals id="BSPTreeIntervals.t:bison_2013" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:bison_2013"/>
             </distribution>
 
             <!-- Smoothing prior -->
-            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
+            <distribution id="MarkovChainedPopSizes.t:bison_2013" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:bison_2013"/>
 
             <!-- Site and clock model priors --> 
             <prior id="KappaPrior.s:bison_2013" name="distribution" x="@kappa.s:bison_2013">
@@ -395,7 +397,7 @@
         <!-- End prior -->
 
         <!-- Begin likelihood -->
-        <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+        <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
             <!-- Alignment likelihood -->
             <distribution id="treeLikelihood.bison_2013" spec="ThreadedTreeLikelihood" data="@bison_2013" tree="@Tree.t:bison_2013">
@@ -411,7 +413,7 @@
                 </siteModel>
 
                 <!-- Clock model (strict clock) -->
-                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
+                <branchRateModel id="StrictClock.c:bison_2013" spec="beast.base.evolution.branchratemodel.StrictClockModel" clock.rate="@clockRate.c:bison_2013"/>
 
             </distribution>            
         </distribution>
@@ -465,7 +467,7 @@
         <log idref="freqParameter.s:bison_2013"/>
         <log idref="clockRate.c:bison_2013"/>
 
-        <log id="TreeHeight.t:bison_2013" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeHeight.t:bison_2013" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:bison_2013"/>
         <log idref="bPopSizes.t:bison_2013"/>
         <log idref="bGroupSizes.t:bison_2013"/>
     </logger>
@@ -478,7 +480,7 @@
     </logger>
 
     <logger id="treelog" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
+        <log id="TreeWithMetaDataLogger.t:bison_2013" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:bison_2013"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/hcv_bsp_mcpgamma.xml b/examples/BSP/hcv_bsp_mcpgamma.xml
index 492ffce..8b916ea 100644
--- a/examples/BSP/hcv_bsp_mcpgamma.xml
+++ b/examples/BSP/hcv_bsp_mcpgamma.xml
@@ -1,29 +1,32 @@
 <?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
-                                                           :bsp.distributions
-                                                           :bsp.util" 
-          required="" version="2.5">
-
-
-
-<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>
+<beast beautitemplate='Standard' beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
+
+
+
+<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>
 
 
 <data id="hcv" name="alignment">
@@ -118,25 +121,25 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:hcv" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
+    <init id="RandomTree.t:hcv" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
         <populationModel id="ConstantPopulation0.t:hcv" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:hcv" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
           <!-- Begin prior -->
-          <distribution id="prior" spec="util.CompoundDistribution">
+          <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
               <!-- Treeprior (Bayesian Skyline Plot) -->
               <distribution id="BayesianSkyline.t:hcv" spec="BSP" popSizes="@bPopSizes.t:hcv" popSizeGroupSizes="@bGroupSizes.t:hcv">
-                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="TreeIntervals" tree="@Tree.t:hcv"/>                  
+                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:hcv"/>                  
               </distribution>
               
               <!-- Smoothing prior -->
-              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
+              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
 
 
               <!-- Site model priors --> 
@@ -165,7 +168,7 @@
 
 
           <!-- Begin likelihood -->
-          <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+          <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
                <!-- Alignment likelihood -->
                <distribution id="treeLikelihood.hcv" spec="ThreadedTreeLikelihood" data="@hcv" tree="@Tree.t:hcv">
@@ -181,7 +184,7 @@
                     </siteModel>
 
                     <!-- Clock model (fixed clock-rate) -->
-                    <branchRateModel id="StrictClock.c:hcv" spec="beast.evolution.branchratemodel.StrictClockModel">
+                    <branchRateModel id="StrictClock.c:hcv" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                          <parameter id="clockRate.c:hcv" estimate="false" name="clock.rate">7.9E-4</parameter>
                     </branchRateModel>
 
@@ -242,7 +245,7 @@
         <log idref="rateGT.s:hcv"/>
         <log idref="freqParameter.s:hcv"/>
 
-        <log id="TreeHeight.t:hcv" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
+        <log id="TreeHeight.t:hcv" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
         <log idref="bPopSizes.t:hcv"/>
         <log idref="bGroupSizes.t:hcv"/>                
         <log id="bChangeTimes" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:hcv"/>                     
@@ -257,7 +260,7 @@
     </logger>
 
     <logger id="treelog.t:hcv" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
+        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/hcv_bsp_mcpgamma_skylinecomparison.xml b/examples/BSP/hcv_bsp_mcpgamma_skylinecomparison.xml
index e44de7a..7d88d3a 100644
--- a/examples/BSP/hcv_bsp_mcpgamma_skylinecomparison.xml
+++ b/examples/BSP/hcv_bsp_mcpgamma_skylinecomparison.xml
@@ -1,29 +1,32 @@
 <?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
-                                                           :bsp.distributions
-                                                           :bsp.util" 
-          required="" version="2.5">
-
-
-
-<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>
+<beast beautitemplate='Standard' beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
+
+
+
+<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>
 
 
 <data id="hcv" name="alignment">
@@ -118,21 +121,21 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:hcv" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
+    <init id="RandomTree.t:hcv" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
         <populationModel id="ConstantPopulation0.t:hcv" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:hcv" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
           <!-- Begin prior -->
-          <distribution id="prior" spec="util.CompoundDistribution">
+          <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
               <!-- Treeprior (Bayesian Skyline Plot) -->
               <distribution id="BayesianSkyline.t:hcv" spec="BayesianSkyline" groupSizes="@bGroupSizes.t:hcv" popSizes="@bPopSizes.t:hcv">
-                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="TreeIntervals" tree="@Tree.t:hcv"/>
+                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:hcv"/>
               </distribution>
 
               <distribution id="BayesianSkylineNew.t:hcv" spec="BSP" popSizes="@bPopSizes.t:hcv" popSizeGroupSizes="@bGroupSizes.t:hcv">
@@ -140,7 +143,7 @@
               </distribution>
               
               <!-- Smoothing prior -->
-              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
+              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
 
 
               <!-- Site model priors --> 
@@ -169,7 +172,7 @@
 
 
           <!-- Begin likelihood -->
-          <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+          <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
                <!-- Alignment likelihood -->
                <distribution id="treeLikelihood.hcv" spec="ThreadedTreeLikelihood" data="@hcv" tree="@Tree.t:hcv">
@@ -185,7 +188,7 @@
                     </siteModel>
 
                     <!-- Clock model (fixed clock-rate) -->
-                    <branchRateModel id="StrictClock.c:hcv" spec="beast.evolution.branchratemodel.StrictClockModel">
+                    <branchRateModel id="StrictClock.c:hcv" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                          <parameter id="clockRate.c:hcv" estimate="false" name="clock.rate">7.9E-4</parameter>
                     </branchRateModel>
 
@@ -248,7 +251,7 @@
         <log idref="rateGT.s:hcv"/>
         <log idref="freqParameter.s:hcv"/>
 
-        <log id="TreeHeight.t:hcv" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
+        <log id="TreeHeight.t:hcv" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
         <log idref="bPopSizes.t:hcv"/>
         <log idref="bGroupSizes.t:hcv"/>        
         <log id="bChangeTimes" spec="popSizeChangeTimeLogger" skyline="@BayesianSkylineNew.t:hcv"/>                     
@@ -265,7 +268,7 @@
     </logger>
 
     <logger id="treelog.t:hcv" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
+        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/hcv_bsp_robust.xml b/examples/BSP/hcv_bsp_robust.xml
index bcffcea..603e51a 100644
--- a/examples/BSP/hcv_bsp_robust.xml
+++ b/examples/BSP/hcv_bsp_robust.xml
@@ -1,30 +1,32 @@
 <?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.core.parameter
-                                                           :beast.evolution.nuc
-                                                           :beast.evolution.operators
-                                                           :beast.evolution.sitemodel
-                                                           :beast.evolution.substitutionmodel
-                                                           :beast.evolution.likelihood
-                                                           :bsp.distributions
-                                                           :bsp.util" 
-          required="" version="2.5">
-
-
-
-<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>
+<beast beautitemplate='Standard' beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
+
+
+
+<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>
 
 
 <data id="hcv" name="alignment">
@@ -118,21 +120,21 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:hcv" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
+    <init id="RandomTree.t:hcv" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
         <populationModel id="ConstantPopulation0.t:hcv" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:hcv" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
           <!-- Begin prior -->
-          <distribution id="prior" spec="util.CompoundDistribution">
+          <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
               <!-- Treeprior (Bayesian Skyline Plot) -->
               <distribution id="BayesianSkyline.t:hcv" spec="BSP" popSizes="@bPopSizes.t:hcv">
-                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="TreeIntervals" tree="@Tree.t:hcv"/>
+                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:hcv"/>
                   <popSizeGroupSizes id="bGroupSizes.t:hcv" spec="IntegerParameter" dimension="10" value="1"/>
               </distribution>
               <!-- Prior on Ne -->
@@ -141,7 +143,7 @@
               </prior-->
               
               <!-- Smoothing prior -->
-              <!--distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/-->
+              <!--distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/-->
 
 
               <!-- Site model priors --> 
@@ -170,7 +172,7 @@
 
 
           <!-- Begin likelihood -->
-          <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+          <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
                <!-- Alignment likelihood -->
                <distribution id="treeLikelihood.hcv" spec="ThreadedTreeLikelihood" data="@hcv" tree="@Tree.t:hcv">
@@ -186,7 +188,7 @@
                     </siteModel>
 
                     <!-- Clock model (fixed clock-rate) -->
-                    <branchRateModel id="StrictClock.c:hcv" spec="beast.evolution.branchratemodel.StrictClockModel">
+                    <branchRateModel id="StrictClock.c:hcv" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                          <parameter id="clockRate.c:hcv" estimate="false" name="clock.rate">7.9E-4</parameter>
                     </branchRateModel>
 
@@ -243,7 +245,7 @@
         <log idref="rateGT.s:hcv"/>
         <log idref="freqParameter.s:hcv"/>
 
-        <log id="TreeHeight.t:hcv" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
+        <log id="TreeHeight.t:hcv" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
         <log idref="bPopSizes.t:hcv"/>
         <log idref="bGroupSizes.t:hcv"/>     
         <log id="bChangeTimes" spec="popSizeChangeTimeLogger" skyline="@BayesianSkyline.t:hcv"/>                
@@ -257,7 +259,7 @@
     </logger>
 
     <logger id="treelog.t:hcv" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
+        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
     </logger>
 
 </run>
diff --git a/examples/BSP/hcv_bspold_mcpgamma.xml b/examples/BSP/hcv_bspold_mcpgamma.xml
index ba049a5..4f9fd68 100644
--- a/examples/BSP/hcv_bspold_mcpgamma.xml
+++ b/examples/BSP/hcv_bspold_mcpgamma.xml
@@ -1,27 +1,32 @@
 <?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">
-
-
-
-<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>
+<beast beautitemplate='Standard' beautistatus=''
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util"
+       required="BEAST v2.7.2"
+       version="2.7">
+
+
+
+<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>
 
 
 <data id="hcv" name="alignment">
@@ -116,25 +121,25 @@
     </state>
 
     <!-- Initial tree -->
-    <init id="RandomTree.t:hcv" spec="beast.evolution.tree.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
+    <init id="RandomTree.t:hcv" spec="beast.base.evolution.tree.coalescent.RandomTree" estimate="false" initial="@Tree.t:hcv" taxa="@hcv">
         <populationModel id="ConstantPopulation0.t:hcv" spec="ConstantPopulation">
             <parameter id="randomPopSize.t:hcv" name="popSize">1.0</parameter>
         </populationModel>
     </init>
 
 
-    <distribution id="posterior" spec="util.CompoundDistribution">
+    <distribution id="posterior" spec="beast.base.inference.CompoundDistribution">
 
           <!-- Begin prior -->
-          <distribution id="prior" spec="util.CompoundDistribution">
+          <distribution id="prior" spec="beast.base.inference.CompoundDistribution">
 
               <!-- Treeprior (Bayesian Skyline Plot) -->
               <distribution id="BayesianSkyline.t:hcv" spec="BayesianSkyline" popSizes="@bPopSizes.t:hcv" groupSizes="@bGroupSizes.t:hcv">
-                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="TreeIntervals" tree="@Tree.t:hcv"/>                  
+                  <treeIntervals id="BSPTreeIntervals.t:hcv" spec="beast.base.evolution.tree.TreeIntervals" tree="@Tree.t:hcv"/>                  
               </distribution>
               
               <!-- Smoothing prior -->
-              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.math.distributions.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
+              <distribution id="MarkovChainedPopSizes.t:hcv" spec="beast.base.inference.distribution.MarkovChainDistribution" jeffreys="true" parameter="@bPopSizes.t:hcv"/>
 
 
               <!-- Site model priors --> 
@@ -163,7 +168,7 @@
 
 
           <!-- Begin likelihood -->
-          <distribution id="likelihood" spec="util.CompoundDistribution" useThreads="true">
+          <distribution id="likelihood" spec="beast.base.inference.CompoundDistribution" useThreads="true">
 
                <!-- Alignment likelihood -->
                <distribution id="treeLikelihood.hcv" spec="ThreadedTreeLikelihood" data="@hcv" tree="@Tree.t:hcv">
@@ -179,7 +184,7 @@
                     </siteModel>
 
                     <!-- Clock model (fixed clock-rate) -->
-                    <branchRateModel id="StrictClock.c:hcv" spec="beast.evolution.branchratemodel.StrictClockModel">
+                    <branchRateModel id="StrictClock.c:hcv" spec="beast.base.evolution.branchratemodel.StrictClockModel">
                          <parameter id="clockRate.c:hcv" estimate="false" name="clock.rate">7.9E-4</parameter>
                     </branchRateModel>
 
@@ -241,7 +246,7 @@
         <log idref="rateGT.s:hcv"/>
         <log idref="freqParameter.s:hcv"/>
 
-        <log id="TreeHeight.t:hcv" spec="beast.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
+        <log id="TreeHeight.t:hcv" spec="beast.base.evolution.tree.TreeHeightLogger" tree="@Tree.t:hcv"/>        
         <log idref="bPopSizes.t:hcv"/>
         <log idref="bGroupSizes.t:hcv"/>        
     </logger>
@@ -255,7 +260,7 @@
     </logger>
 
     <logger id="treelog.t:hcv" fileName="output/$(filebase)_$(seed).trees" logEvery="10000" mode="tree">
-        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.evolution.tree.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
+        <log id="TreeWithMetaDataLogger.t:hcv" spec="beast.base.evolution.TreeWithMetaDataLogger" tree="@Tree.t:hcv"/>
     </logger>
 
 </run>
diff --git a/fxtemplates/TreePriorsBESP.xml b/fxtemplates/TreePriorsBESP.xml
new file mode 100644
index 0000000..1ada65d
--- /dev/null
+++ b/fxtemplates/TreePriorsBESP.xml
@@ -0,0 +1,138 @@
+<beast version='2.7'
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util" >
+
+
+    <mergewith point='misc' fragment="@TreeOperators"/>
+
+
+    <mergewith point='misc'>
+       
+        <fragment id="BESP_params" spec="beastfx.app.beauti.Fragment">
+
+            <![CDATA[
+
+            <!-- Population size prior -->
+            <distribution id='$(b)MarkovChainedPopSizes.t:$(n)' spec="beast.base.inference.distribution.MarkovChainDistribution" 
+                        jeffreys="true"
+                        parameter="@$(b)PopSizes.t:$(n)"/>
+
+            <!-- Sampling intensity prior -->
+            <prior id="$(b)SamplingIntensityPrior.t:$(n)" name="distribution" x="@$(b)SamplingIntensity.t:$(n)">
+                <Exponential name="distr" mean="1.0"/>
+            </prior>
+
+            <!-- Operators -->
+            <operator id='$(b)PopSizesScaler.t:$(n)' spec='ScaleOperator' scaleFactor="0.75" weight="15" parameter="@$(b)PopSizes.t:$(n)"/>
+            <operator id='$(b)GroupSizesDelta.t:$(n)' spec='DeltaExchangeOperator' delta="1" weight="6" integer="true"
+                      intparameter="@$(b)GroupSizes.t:$(n)"/>
+            <operator id="$(b)SamplingIntensityScaler.t:$(n)" spec="ScaleOperator" parameter="@$(b)SamplingIntensity.t:$(n)" scaleFactor="0.5" weight="2.0"/>
+
+            <!-- Change-point time loggers -->
+            <plugin id="$(b)PopSizeChangeTimes.t:$(n)" spec="bsp.util.popSizeChangeTimeLogger" skyline="@$(b).t:$(n)"/>        
+            <plugin id="$(b)SamplingIntensityChangeTimes.t:$(n)" spec="bsp.util.samplingIntensityChangeTimeLogger" skyline="@$(b).t:$(n)"/>     
+
+
+            ]]>
+
+            <!-- Connect parameters to state -->
+            <connect srcID='$(b)PopSizes.t:$(n)' targetID='state' inputName='stateNode'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'/>
+            <connect srcID='$(b)SamplingIntensity.t:$(n)' targetID='state' inputName='stateNode'
+                     if='inposterior($(b).t:$(n)) and $(b)SamplingIntensity.t:$(n)/estimate=true'/>
+            <connect srcID='$(b)GroupSizes.t:$(n)' targetID='state' inputName='stateNode'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'/>
+
+
+            <!-- Connect prior distributions to prior -->
+            <connect srcID='$(b).t:$(n)' targetID='prior' inputName='distribution'
+                     if='inposterior($(b).t:$(n)) and Tree.t:$(n)/estimate=true'>Coalescent with BESP tree t:$(n)
+            </connect>
+            <connect srcID='$(b)MarkovChainedPopSizes.t:$(n)' targetID='prior' inputName='distribution'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'>Markov chained prior on population sizes of BESP
+            </connect>
+            <connect srcID='$(b)SamplingIntensityPrior.t:$(n)' targetID='prior' inputName='distribution'
+                     if='inposterior($(b).t:$(n)) and $(b)SamplingIntensity.t:$(n)/estimate=true'>Prior on sampling intensity of BESP
+            </connect>
+
+
+            <!-- Connect operators -->                                
+            <connect srcID='$(b)PopSizesScaler.t:$(n)' targetID='mcmc' inputName='operator'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'>Scale population size of BESP prior of tree t:$(n)
+            </connect>
+            <connect srcID='$(b)SamplingIntensityScaler.t:$(n)' targetID='mcmc' inputName='operator'
+                     if='inposterior($(b).t:$(n)) and $(b)SamplingIntensity.t:$(n)/estimate=true'>Scale sampling intensity of BESP prior of tree t:$(n)
+            </connect>                
+            <connect srcID='$(b)GroupSizesDelta.t:$(n)' targetID='mcmc' inputName='operator'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'>Exchange group sizes of BESP prior of tree t:$(n)
+            </connect>
+            
+
+            <!-- Connect parameters to tracelog -->
+            <connect srcID='$(b).t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n))'/>
+            <connect srcID='$(b)PopSizes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'/>            
+            <connect srcID='$(b)SamplingIntensity.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n)) and $(b)SamplingIntensity.t:$(n)/estimate=true'/>            
+            <connect srcID='$(b)GroupSizes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'/>
+            <connect srcID='$(b)PopSizeChangeTimes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n))'/>            
+            <connect srcID='$(b)SamplingIntensityChangeTimes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n))'/>           
+        
+        </fragment>
+    </mergewith>
+
+
+
+ 	<!-- BESP tree prior configurations -->
+    <mergewith point='treePriorTemplates'>
+
+        <!-- Coalescent BESP -->        
+        <subtemplate id='CoalescentBESP' class='bsp.distributions.BESP'
+                     mainid='BESP.t:$(n)'
+                     suppressInputs='beast.base.inference.distribution.MarkovChainDistribution.parameter,                                     
+                                     bsp.distributions.BESP.tree,
+                                     bsp.distributions.BESP.treeIntervals,
+                                     bsp.distributions.BESP.popSizeEpochTimes,
+                                     bsp.distributions.BESP.samplingIntensityGroupSizes,
+                                     bsp.distributions.BESP.samplingEpochTimes,
+                                     bsp.distributions.BESP.numInitializationAttempts'>
+
+            <plate var="b" range="BESP">
+
+                <![CDATA[
+
+                    <distribution spec="bsp.distributions.BESP" id='$(b).t:$(n)'>
+                        <parameter name='popSizes' id='$(b)PopSizes.t:$(n)' dimension="5" value="380.0" lower="0.0" estimate='true'/>
+                        <parameter name='samplingIntensity' id='$(b)SamplingIntensity.t:$(n)' dimension="1" value="1" lower="0.0" estimate='true'/>
+                        <popSizeGroupSizes spec='parameter.IntegerParameter' id='$(b)GroupSizes.t:$(n)' dimension='5' value='1' estimate='true'/>
+                        <treeIntervals spec="beast.base.evolution.tree.TreeIntervals" id='$(b)TreeIntervals.t:$(n)' tree='@Tree.t:$(n)'/>
+                    </distribution>
+                   
+                ]]>
+
+            </plate>
+
+            <plate fragment="TreeOperators" var="m" range="BESP"/>
+            <plate fragment="BESP_params" var="b" range="BESP"/>
+
+        </subtemplate>
+
+
+    </mergewith>
+
+
+</beast>
\ No newline at end of file
diff --git a/fxtemplates/TreePriorsBSP.xml b/fxtemplates/TreePriorsBSP.xml
new file mode 100644
index 0000000..a0e3cb3
--- /dev/null
+++ b/fxtemplates/TreePriorsBSP.xml
@@ -0,0 +1,115 @@
+<beast version='2.7'
+       namespace="beast.base.core:beast.base.inference
+                 :beast.base.evolution.alignment
+                 :beast.base.evolution.tree.coalescent
+                 :beast.base.util
+                 :beast.base.inference.parameter
+                 :beast.base.evolution.nuc
+                 :beast.base.evolution.operator:beast.base.inference.operator
+                 :beast.base.evolution.sitemodel
+                 :beast.base.evolution.substitutionmodel
+                 :beast.base.evolution.likelihood
+                 :bsp.distributions
+                 :bsp.util" >
+
+
+    <mergewith point='misc' fragment="@TreeOperators"/>
+
+
+    <mergewith point='misc'>
+        <fragment id="BSP_params" spec="beastfx.app.beauti.Fragment">
+
+            <![CDATA[
+
+            <!-- Population size prior -->
+            <distribution id='$(b)MarkovChainedPopSizes.t:$(n)' spec="beast.base.inference.distribution.MarkovChainDistribution" 
+                        jeffreys="true"
+                        parameter="@$(b)PopSizes.t:$(n)"/>
+            
+            <!-- Operators -->
+            <operator id='$(b)PopSizesScaler.t:$(n)' spec='ScaleOperator' scaleFactor="0.75" weight="15" parameter="@$(b)PopSizes.t:$(n)"/>
+            <operator id='$(b)GroupSizesDelta.t:$(n)' spec='DeltaExchangeOperator' delta="1" weight="6" integer="true"
+                      intparameter="@$(b)GroupSizes.t:$(n)"/>
+
+            <!-- Change-point time loggers -->
+            <plugin id="$(b)PopSizeChangeTimes.t:$(n)" spec="bsp.util.popSizeChangeTimeLogger" skyline="@$(b).t:$(n)"/>        
+
+            ]]>
+
+            <!-- Connect parameters to state -->
+            <connect srcID='$(b)PopSizes.t:$(n)' targetID='state' inputName='stateNode'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'/>
+            <connect srcID='$(b)GroupSizes.t:$(n)' targetID='state' inputName='stateNode'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'/>
+
+
+            <!-- Connect prior distributions to prior -->
+            <connect srcID='$(b).t:$(n)' targetID='prior' inputName='distribution'
+                     if='inposterior($(b).t:$(n)) and Tree.t:$(n)/estimate=true'>Coalescent with BSP tree t:$(n)
+            </connect>
+            <connect srcID='$(b)MarkovChainedPopSizes.t:$(n)' targetID='prior' inputName='distribution'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'>Markov chained prior on population sizes of BSP
+            </connect>
+            
+
+            <!-- Connect operators -->                                
+            <connect srcID='$(b)PopSizesScaler.t:$(n)' targetID='mcmc' inputName='operator'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'>Scale population size of BSP prior of tree t:$(n)
+            </connect>
+            <connect srcID='$(b)GroupSizesDelta.t:$(n)' targetID='mcmc' inputName='operator'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'>Exchange group sizes of BSP prior of tree t:$(n)
+            </connect>
+            
+
+            <!-- Connect parameters to tracelog -->
+            <connect srcID='$(b).t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n))'/>
+            <connect srcID='$(b)PopSizes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n)) and $(b)PopSizes.t:$(n)/estimate=true'/>            
+            <connect srcID='$(b)GroupSizes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n)) and $(b)GroupSizes.t:$(n)/estimate=true'/>
+            <connect srcID='$(b)PopSizeChangeTimes.t:$(n)' targetID='tracelog' inputName='log'
+                     if='inposterior($(b).t:$(n))'/>            
+        
+        </fragment>
+
+    </mergewith>
+
+
+
+ 	<!-- BSP tree prior configurations -->
+    <mergewith point='treePriorTemplates'>
+
+   		<!-- Coalescent BSP -->        
+        <subtemplate id='CoalescentBSP' class='bsp.distributions.BSP'
+                     mainid='BSP.t:$(n)'
+                     suppressInputs='beast.base.inference.distribution.MarkovChainDistribution.parameter,                                     
+                                     bsp.distributions.BSP.tree,
+                                     bsp.distributions.BSP.treeIntervals,
+                                     bsp.distributions.BSP.popSizeEpochTimes,
+                                     bsp.distributions.BSP.numInitializationAttempts'>
+
+            <plate var="b" range="BSP">
+
+                <![CDATA[
+                    <!-- BSP model -->
+    	            <distribution spec="bsp.distributions.BSP" id='$(b).t:$(n)'>
+    	                <parameter name='popSizes' id='$(b)PopSizes.t:$(n)' dimension="5" value="380.0" lower="0.0" estimate='true'/>
+    	                <popSizeGroupSizes spec='parameter.IntegerParameter' id='$(b)GroupSizes.t:$(n)' dimension='5' value='1' estimate='true'/>
+    	                <treeIntervals spec="beast.base.evolution.tree.TreeIntervals" id='$(b)TreeIntervals.t:$(n)' tree='@Tree.t:$(n)'/>
+    	            </distribution>
+   	          
+    			]]>
+
+            </plate>
+               
+            <plate fragment="TreeOperators" var="m" range="BSP"/>
+            <plate fragment="BSP_params" var="b" range="BSP"/>
+            
+
+        </subtemplate>
+
+    </mergewith>
+
+
+</beast>
\ No newline at end of file
diff --git a/src/bsp/distributions/BESP.java b/src/bsp/distributions/BESP.java
index 0ac99e0..4d38690 100644
--- a/src/bsp/distributions/BESP.java
+++ b/src/bsp/distributions/BESP.java
@@ -1,17 +1,17 @@
 package bsp.distributions;
 
-import beast.core.Citation;
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.parameter.IntegerParameter;
-import beast.core.parameter.RealParameter;
-import beast.core.util.Log;
-import beast.evolution.tree.coalescent.IntervalType;
-import beast.math.Binomial;
+import beast.base.core.Citation;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.core.Log;
+import beast.base.evolution.tree.IntervalType;
+import beast.base.inference.parameter.IntegerParameter;
+import beast.base.inference.parameter.RealParameter;
+import beast.base.util.Binomial;
 
 import java.util.Arrays;
 
-import static beast.evolution.tree.coalescent.IntervalType.SAMPLE;
+import static beast.base.evolution.tree.IntervalType.SAMPLE;
 
 
 /***************************************************************
diff --git a/src/bsp/distributions/BSP.java b/src/bsp/distributions/BSP.java
index 1413a53..72e37b6 100644
--- a/src/bsp/distributions/BSP.java
+++ b/src/bsp/distributions/BSP.java
@@ -1,29 +1,29 @@
 package bsp.distributions;
 
 
-import beast.core.Citation;
-import beast.core.Description;
-import beast.core.Input;
-import beast.core.parameter.IntegerParameter;
-import beast.core.parameter.RealParameter;
-import beast.core.util.Log;
-import beast.evolution.tree.TreeDistribution;
-import beast.evolution.tree.coalescent.IntervalType;
-import beast.evolution.tree.coalescent.TreeIntervals;
-import beast.math.Binomial;
-import beast.util.HeapSort;
-import beast.util.Randomizer;
+import beast.base.core.Citation;
+import beast.base.core.Description;
+import beast.base.core.Input;
+import beast.base.core.Log;
+import beast.base.evolution.tree.IntervalType;
+import beast.base.evolution.tree.TreeDistribution;
+import beast.base.evolution.tree.TreeIntervals;
+import beast.base.inference.parameter.IntegerParameter;
+import beast.base.inference.parameter.RealParameter;
+import beast.base.util.Binomial;
+import beast.base.util.HeapSort;
+import beast.base.util.Randomizer;
 
 import java.util.Arrays;
 
-import static beast.evolution.tree.coalescent.IntervalType.COALESCENT;
+import static beast.base.evolution.tree.IntervalType.COALESCENT;
 
 /*****************************************
  * Bayesian Skyline Plot implementation. *
  *****************************************
  *
  * - This implementation will return the same likelihood as
- *   beast.evolution.tree.coalescent.BayesianSkyline, but will hopefully also be faster
+ *   beast.base.evolution.tree.coalescent.BayesianSkyline, but will hopefully also be faster
  * - This implementation makes use of the TreeIntervals class, like the original BayesianSkyline
  * - Only one parameter (popSizes) which can change only at coalescent times, which are grouped with
  *   popSizeGroupSizes.
diff --git a/src/bsp/util/popSizeChangeTimeLogger.java b/src/bsp/util/popSizeChangeTimeLogger.java
index fa81fbf..6633838 100644
--- a/src/bsp/util/popSizeChangeTimeLogger.java
+++ b/src/bsp/util/popSizeChangeTimeLogger.java
@@ -1,9 +1,9 @@
 package bsp.util;
 
-import beast.core.CalculationNode;
-import beast.core.Function;
-import beast.core.Input;
-import beast.core.Loggable;
+import beast.base.core.Function;
+import beast.base.core.Input;
+import beast.base.core.Loggable;
+import beast.base.inference.CalculationNode;
 import bsp.distributions.BSP;
 
 import java.io.PrintStream;
diff --git a/src/bsp/util/samplingIntensityChangeTimeLogger.java b/src/bsp/util/samplingIntensityChangeTimeLogger.java
index 0a33c5c..9269b49 100644
--- a/src/bsp/util/samplingIntensityChangeTimeLogger.java
+++ b/src/bsp/util/samplingIntensityChangeTimeLogger.java
@@ -1,9 +1,9 @@
 package bsp.util;
 
-import beast.core.CalculationNode;
-import beast.core.Function;
-import beast.core.Input;
-import beast.core.Loggable;
+import beast.base.core.Function;
+import beast.base.core.Input;
+import beast.base.core.Loggable;
+import beast.base.inference.CalculationNode;
 import bsp.distributions.BESP;
 
 import java.io.PrintStream;
diff --git a/test/beastfx/app/beauti/BEAUtiBESPTest.java b/test/beastfx/app/beauti/BEAUtiBESPTest.java
new file mode 100644
index 0000000..2daa0c5
--- /dev/null
+++ b/test/beastfx/app/beauti/BEAUtiBESPTest.java
@@ -0,0 +1,151 @@
+//package test.beast.app.beauti;
+//
+//import org.junit.Test;
+//import test.beastfx.app.beauti.BeautiBase;
+//
+//import java.io.File;
+//
+///* Run from beast2 module path (examples/nexus/Flu.nex needs to be in path) */
+//public class BEAUtiBESPTest extends BeautiBase {
+//
+//    @Test
+//    public void beautiBSPTest() throws Exception {
+//        warning("Load Flu.nex");
+//        importAlignment(NEXUS_DIR, new File("Flu.nex"));
+//
+//        JTabbedPaneFixture f = beautiFrame.tabbedPane();
+//        f.selectTab("Priors");
+//
+//        setAndCheckBSPTreePrior(f);
+//        setAndCheckExpGrowthTreePrior(f);
+//        setAndCheckBSPTreePrior(f);
+//
+//        makeSureXMLParses();
+//    }
+//
+//    @Test
+//    public void beautiBESPTest() throws Exception {
+//        warning("Load Flu.nex");
+//        importAlignment("../beast2/examples/nexus", new File("Flu.nex"));
+//
+//        JTabbedPaneFixture f = beautiFrame.tabbedPane();
+//        f.selectTab("Priors");
+//
+//        setAndCheckBESPTreePrior(f);
+//        setAndCheckExpGrowthTreePrior(f);
+//        setAndCheckBESPTreePrior(f);
+//        setAndCheckBSPTreePrior(f);
+//        setAndCheckBESPTreePrior(f);
+//
+//        makeSureXMLParses();
+//    }
+//
+//
+//
+//    /* Helper functions to set and check tree priors */
+//
+//    private void setAndCheckBSPTreePrior(JTabbedPaneFixture f) throws Exception {
+//
+//        warning("Change to Coalescent - BSP");
+//        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent BSP");
+//        printBeautiState(f);
+//
+//        assertStateEquals("Tree.t:Flu", "BSPPopSizes.t:Flu", "BSPGroupSizes.t:Flu");
+//        assertOperatorsEqual( "BSPTreeScaler.t:Flu",
+//                "BSPTreeRootScaler.t:Flu",
+//                "BSPUniformOperator.t:Flu",
+//                "BSPSubtreeSlide.t:Flu",
+//                "BSPNarrow.t:Flu",
+//                "BSPWide.t:Flu",
+//                "BSPWilsonBalding.t:Flu",
+//                "BSPPopSizesScaler.t:Flu",
+//                "BSPGroupSizesDelta.t:Flu");
+//        assertPriorsEqual("BSP.t:Flu", "BSPMarkovChainedPopSizes.t:Flu");
+//        assertTraceLogEqual(  "posterior",
+//                "likelihood",
+//                "prior",
+//                "treeLikelihood.Flu",
+//                "TreeHeight.t:Flu",
+//                "BSP.t:Flu",
+//                "BSPPopSizes.t:Flu",
+//                "BSPGroupSizes.t:Flu",
+//                "BSPPopSizeChangeTimes.t:Flu");
+//
+//        makeSureXMLParses();
+//
+//    }
+//
+//
+//    private void setAndCheckBESPTreePrior(JTabbedPaneFixture f) throws Exception {
+//
+//        warning("Change to Coalescent - BESP");
+//        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent BESP");
+//        printBeautiState(f);
+//
+//        assertStateEquals("Tree.t:Flu",
+//                "BESPPopSizes.t:Flu",
+//                "BESPGroupSizes.t:Flu",
+//                "BESPSamplingIntensity.t:Flu");
+//        assertOperatorsEqual( "BESPTreeScaler.t:Flu",
+//                "BESPTreeRootScaler.t:Flu",
+//                "BESPUniformOperator.t:Flu",
+//                "BESPSubtreeSlide.t:Flu",
+//                "BESPNarrow.t:Flu",
+//                "BESPWide.t:Flu",
+//                "BESPWilsonBalding.t:Flu",
+//                "BESPPopSizesScaler.t:Flu",
+//                "BESPGroupSizesDelta.t:Flu",
+//                "BESPSamplingIntensityScaler.t:Flu");
+//        assertPriorsEqual("BESP.t:Flu",
+//                "BESPMarkovChainedPopSizes.t:Flu",
+//                "BESPSamplingIntensityPrior.t:Flu");
+//        assertTraceLogEqual(  "posterior",
+//                "likelihood",
+//                "prior",
+//                "treeLikelihood.Flu",
+//                "TreeHeight.t:Flu",
+//                "BESP.t:Flu",
+//                "BESPPopSizes.t:Flu",
+//                "BESPGroupSizes.t:Flu",
+//                "BESPSamplingIntensity.t:Flu",
+//                "BESPPopSizeChangeTimes.t:Flu",
+//                "BESPSamplingIntensityChangeTimes.t:Flu");
+//
+//        makeSureXMLParses();
+//
+//    }
+//
+//
+//    private void setAndCheckExpGrowthTreePrior(JTabbedPaneFixture f) throws Exception {
+//
+//        warning("Change to Coalescent - exponential population");
+//        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent Exponential Population");
+//        printBeautiState(f);
+//
+//        assertStateEquals("Tree.t:Flu", "ePopSize.t:Flu", "growthRate.t:Flu");
+//        assertOperatorsEqual( "CoalescentExponentialTreeScaler.t:Flu",
+//                "CoalescentExponentialTreeRootScaler.t:Flu",
+//                "CoalescentExponentialUniformOperator.t:Flu",
+//                "CoalescentExponentialSubtreeSlide.t:Flu",
+//                "CoalescentExponentialNarrow.t:Flu",
+//                "CoalescentExponentialWide.t:Flu",
+//                "CoalescentExponentialWilsonBalding.t:Flu",
+//                "ePopSizeScaler.t:Flu",
+//                "GrowthRateRandomWalk.t:Flu");
+//        assertPriorsEqual("CoalescentExponential.t:Flu", "ePopSizePrior.t:Flu", "GrowthRatePrior.t:Flu");
+//        assertTraceLogEqual(  "posterior",
+//                "likelihood",
+//                "prior",
+//                "treeLikelihood.Flu",
+//                "TreeHeight.t:Flu",
+//                "CoalescentExponential.t:Flu",
+//                "ePopSize.t:Flu",
+//                "growthRate.t:Flu");
+//
+//        makeSureXMLParses();
+//    }
+//
+//
+//
+//
+//}
diff --git a/test/bsp/distributions/BESPTest.java b/test/bsp/distributions/BESPTest.java
index c455fbd..d7b5d28 100644
--- a/test/bsp/distributions/BESPTest.java
+++ b/test/bsp/distributions/BESPTest.java
@@ -1,8 +1,8 @@
 package bsp.distributions;
 
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.coalescent.TreeIntervals;
-import beast.util.TreeParser;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeIntervals;
+import beast.base.evolution.tree.TreeParser;
 import junit.framework.TestCase;
 import org.junit.Test;
 import test.beast.BEASTTestCase;
diff --git a/test/bsp/distributions/BSPTest.java b/test/bsp/distributions/BSPTest.java
index 41981fc..06ebc60 100644
--- a/test/bsp/distributions/BSPTest.java
+++ b/test/bsp/distributions/BSPTest.java
@@ -1,10 +1,10 @@
 package bsp.distributions;
 
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.coalescent.BayesianSkyline;
-import beast.evolution.tree.coalescent.TreeIntervals;
-import beast.math.Binomial;
-import beast.util.TreeParser;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeIntervals;
+import beast.base.evolution.tree.TreeParser;
+import beast.base.evolution.tree.coalescent.BayesianSkyline;
+import beast.base.util.Binomial;
 import junit.framework.TestCase;
 import org.junit.Test;
 import test.beast.BEASTTestCase;
@@ -14,7 +14,7 @@
  * Unit tests for bsp.distributions.BSP.java
  *
  * - Compare likelihood to the classical and generalized skyline plots in Ape
- * - Compare likelihood to the original Bayesian Skyline Plot implementation in BEAST2 core (beast.evolution.tree.coalescent.BayesianSkyline.java)
+ * - Compare likelihood to the original Bayesian Skyline Plot implementation in BEAST2 core (beast.base.evolution.tree.coalescent.BayesianSkyline.java)
  * - Test methods for getting segment change times
  * - Test methods for getting population size at different times (this is slightly different to the original Bayesian Skyline Plot)
  *
diff --git a/test/bsp/distributions/TreeIntervalsTest.java b/test/bsp/distributions/TreeIntervalsTest.java
index b0fe571..c8b8e59 100644
--- a/test/bsp/distributions/TreeIntervalsTest.java
+++ b/test/bsp/distributions/TreeIntervalsTest.java
@@ -1,17 +1,17 @@
 package bsp.distributions;
 
-import beast.evolution.tree.Tree;
-import beast.evolution.tree.coalescent.IntervalType;
-import beast.evolution.tree.coalescent.TreeIntervals;
-import beast.util.TreeParser;
+import beast.base.evolution.tree.IntervalType;
+import beast.base.evolution.tree.Tree;
+import beast.base.evolution.tree.TreeIntervals;
+import beast.base.evolution.tree.TreeParser;
 import junit.framework.TestCase;
 import org.junit.Test;
 
-import static beast.evolution.tree.coalescent.IntervalType.SAMPLE;
+import static beast.base.evolution.tree.IntervalType.SAMPLE;
 
 
 /**
- * Unit tests for beast.evolution.tree.coalescent.TreeIntervals.java
+ * Unit tests for beast.base.evolution.tree.TreeIntervals.java
  *
  * These are mostly just to check that TreeIntervals does what I think it does
  *
diff --git a/test/test/beast/app/beauti/BEAUtiBESPTest.java b/test/test/beast/app/beauti/BEAUtiBESPTest.java
deleted file mode 100644
index f89ea23..0000000
--- a/test/test/beast/app/beauti/BEAUtiBESPTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package test.beast.app.beauti;
-
-import org.fest.swing.fixture.JTabbedPaneFixture;
-import org.junit.Test;
-
-import java.io.File;
-
-/* Run from beast2 module path (examples/nexus/Flu.nex needs to be in path) */
-public class BEAUtiBESPTest extends BeautiBase {
-
-    @Test
-    public void beautiBSPTest() throws Exception {
-        warning("Load Flu.nex");
-        importAlignment("../beast2/examples/nexus", new File("Flu.nex"));
-
-        JTabbedPaneFixture f = beautiFrame.tabbedPane();
-        f.selectTab("Priors");
-
-        setAndCheckBSPTreePrior(f);
-        setAndCheckExpGrowthTreePrior(f);
-        setAndCheckBSPTreePrior(f);
-
-        makeSureXMLParses();
-    }
-
-    @Test
-    public void beautiBESPTest() throws Exception {
-        warning("Load Flu.nex");
-        importAlignment("../beast2/examples/nexus", new File("Flu.nex"));
-
-        JTabbedPaneFixture f = beautiFrame.tabbedPane();
-        f.selectTab("Priors");
-
-        setAndCheckBESPTreePrior(f);
-        setAndCheckExpGrowthTreePrior(f);
-        setAndCheckBESPTreePrior(f);
-        setAndCheckBSPTreePrior(f);
-        setAndCheckBESPTreePrior(f);
-
-        makeSureXMLParses();
-    }
-
-
-
-    /* Helper functions to set and check tree priors */
-
-    private void setAndCheckBSPTreePrior(JTabbedPaneFixture f) throws Exception {
-
-        warning("Change to Coalescent - BSP");
-        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent BSP");
-        printBeautiState(f);
-
-        assertStateEquals("Tree.t:Flu", "BSPPopSizes.t:Flu", "BSPGroupSizes.t:Flu");
-        assertOperatorsEqual( "BSPTreeScaler.t:Flu",
-                "BSPTreeRootScaler.t:Flu",
-                "BSPUniformOperator.t:Flu",
-                "BSPSubtreeSlide.t:Flu",
-                "BSPNarrow.t:Flu",
-                "BSPWide.t:Flu",
-                "BSPWilsonBalding.t:Flu",
-                "BSPPopSizesScaler.t:Flu",
-                "BSPGroupSizesDelta.t:Flu");
-        assertPriorsEqual("BSP.t:Flu", "BSPMarkovChainedPopSizes.t:Flu");
-        assertTraceLogEqual(  "posterior",
-                "likelihood",
-                "prior",
-                "treeLikelihood.Flu",
-                "TreeHeight.t:Flu",
-                "BSP.t:Flu",
-                "BSPPopSizes.t:Flu",
-                "BSPGroupSizes.t:Flu",
-                "BSPPopSizeChangeTimes.t:Flu");
-
-        makeSureXMLParses();
-
-    }
-
-
-    private void setAndCheckBESPTreePrior(JTabbedPaneFixture f) throws Exception {
-
-        warning("Change to Coalescent - BESP");
-        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent BESP");
-        printBeautiState(f);
-
-        assertStateEquals("Tree.t:Flu",
-                "BESPPopSizes.t:Flu",
-                "BESPGroupSizes.t:Flu",
-                "BESPSamplingIntensity.t:Flu");
-        assertOperatorsEqual( "BESPTreeScaler.t:Flu",
-                "BESPTreeRootScaler.t:Flu",
-                "BESPUniformOperator.t:Flu",
-                "BESPSubtreeSlide.t:Flu",
-                "BESPNarrow.t:Flu",
-                "BESPWide.t:Flu",
-                "BESPWilsonBalding.t:Flu",
-                "BESPPopSizesScaler.t:Flu",
-                "BESPGroupSizesDelta.t:Flu",
-                "BESPSamplingIntensityScaler.t:Flu");
-        assertPriorsEqual("BESP.t:Flu",
-                "BESPMarkovChainedPopSizes.t:Flu",
-                "BESPSamplingIntensityPrior.t:Flu");
-        assertTraceLogEqual(  "posterior",
-                "likelihood",
-                "prior",
-                "treeLikelihood.Flu",
-                "TreeHeight.t:Flu",
-                "BESP.t:Flu",
-                "BESPPopSizes.t:Flu",
-                "BESPGroupSizes.t:Flu",
-                "BESPSamplingIntensity.t:Flu",
-                "BESPPopSizeChangeTimes.t:Flu",
-                "BESPSamplingIntensityChangeTimes.t:Flu");
-
-        makeSureXMLParses();
-
-    }
-
-
-    private void setAndCheckExpGrowthTreePrior(JTabbedPaneFixture f) throws Exception {
-
-        warning("Change to Coalescent - exponential population");
-        beautiFrame.comboBox("TreeDistribution").selectItem("Coalescent Exponential Population");
-        printBeautiState(f);
-
-        assertStateEquals("Tree.t:Flu", "ePopSize.t:Flu", "growthRate.t:Flu");
-        assertOperatorsEqual( "CoalescentExponentialTreeScaler.t:Flu",
-                "CoalescentExponentialTreeRootScaler.t:Flu",
-                "CoalescentExponentialUniformOperator.t:Flu",
-                "CoalescentExponentialSubtreeSlide.t:Flu",
-                "CoalescentExponentialNarrow.t:Flu",
-                "CoalescentExponentialWide.t:Flu",
-                "CoalescentExponentialWilsonBalding.t:Flu",
-                "ePopSizeScaler.t:Flu",
-                "GrowthRateRandomWalk.t:Flu");
-        assertPriorsEqual("CoalescentExponential.t:Flu", "ePopSizePrior.t:Flu", "GrowthRatePrior.t:Flu");
-        assertTraceLogEqual(  "posterior",
-                "likelihood",
-                "prior",
-                "treeLikelihood.Flu",
-                "TreeHeight.t:Flu",
-                "CoalescentExponential.t:Flu",
-                "ePopSize.t:Flu",
-                "growthRate.t:Flu");
-
-        makeSureXMLParses();
-    }
-
-
-
-
-}
diff --git a/version.xml b/version.xml
index 5cc34da..00bb148 100644
--- a/version.xml
+++ b/version.xml
@@ -1,6 +1,12 @@
-<addon name="besp" version="0.2.0">
-            <depends on="BEAST" atleast="2.5.0"/>
+<package name="besp" version="1.0.0">
+    <depends on='BEAST.base' atleast='2.7.2'/>
+    <depends on='BEAST.app' atleast='2.7.2'/>
 
-            <!-- Add other dependencies as necessary. -->
-</addon>
+    <service type="beast.base.core.BEASTInterface">
+        <provider classname="bsp.distributions.BESP"/>
+        <provider classname="bsp.distributions.BSP"/>
+        <provider classname="bsp.util.popSizeChangeTimeLogger"/>
+        <provider classname="bsp.util.samplingIntensityChangeTimeLogger"/>
+    </service>
+</package>