Changed to separated jars