refactoring: classes renamed, traversing package removed