Improved controller directory
Merge pull request #259 from fabienrohrer/master

Improved controller directory