refactored Service package and build.xml
fix Classname in Sample Test