fiddeling with the scheme

* changed some field names
* changed some objects to arrays which makes indexing easier