Fix package, copyright note and add a few javadocs