redone structure
Merge branch 'master' of https://github.com/sw701e14/report