Fixed resource paths, some hashing bugs.  java unit tests now pass