Refactoring: reorganized rules classes. Removed complete class package names from data
Refactoring: reorganized rules classes. Removed complete class package names from data