Remove package-info.java, use generic MultiKeyMap