Some changes to make executable jar easier to handle