- removed unused methods
- repackaged test groovy classes to more realistic folders