Improve testdata
Add comments to adjustments
Restructure directories (add Models directories)
Add Discounter class