move files to the right places, update hibernate mocks for different Hibernate API, update diff clients with different constructor
Steve:  cleanup and fix location-related test failures