Move hamcrest bean to use org.exparity package name