CW-222: Directive refactoring
Merge pull request #39 from CloudifySource/CW-222-directive-refactor

CW-222: Directive refactoring