Move JarArchiveDao
Fix test
Fix dep
Further import fixes