Commenting, structuring and refactoring some.
Merge remote-tracking branch 'origin/master' into AH-282_Create_level