Light refactoring, moving everything into Director
Merge remote-tracking branch 'origin/master'