Consolidated classes
Deleted old packages
Fixed query in JdoPersistenceTest