Switch to one-jar