Fixed null pointer exceptions
Aligned structure and improved readability
Merge branch 'master' of https://github.com/ICS-TU-Ilmenau/fog