don't disable cache
rename classes for better structure

- iterators in own subfolder
- Package not in Dependency, as it's not a dependency