Fixed structuring again

This should be fixed
Merge branch 'Graphics' of https://github.com/DComm2013Network/CutThePower into Graphics
fixed the structuring once again!

this shit is crazy!