First start for issue #22, removed progress bar and everything related to it
Some more fixes
Merge pull request #23 from paul999/ticket/22

First start for issue #22, removed progress bar and everything related t...
Check differently for packaging structure.
Hopefully it works, not tested yet with right structure.
A bit of code formatting