Changed to using one-jar for packaging