changed/improved stock structure

* store charges instead of crates now
* introduced charge data structure
* adjusted tests