Split into to maven projects related to gh-1