restructured the stuff based on the mindmap
Merge branch 'master' of https://github.com/david-istvan/thesis2.git