Solution structure

It looks nice when referring to `initial.time` etc. though. Let's leave it like that for the moment.