Gaf namespace

Also slighty refactored code:
* remove include guards
* changed NULL to nullptr