Cleaning up file structure
Merge branch 'master' of https://github.com/olilea/StockPP