cleanup, code in progress
code cleanup, code works (as before)
disc speed still different
Merge pull request #6 from horstjens/master

code re-organisation in classes