Tidying up packages
Getting rid of classes
tweaked the pooling / simple collections
Refactor