Remove and rename some packages
Remove and rename some package and class
Modify the Rule Test and remove unnecesary code