Refactor to proper package
Add manifest w/ classpath