Improved controller directory

-> Merged Makefile.darwin-op code into a single Makefile.include
-> Simplified the namespace management of the samples
-> Improved misc indentation