001 dave feedback

Some suggestions as proxy for feedback.

* removed all the packages, which avoids all the long import statements and renaming
* added todos with suggestions for further improvements and places where the code is correct, but needs further explanation.