Minor fixes

Re-organize jar, remove tabs