Made the statemachine less dumb >.>
Finalizing removing the blob that is director
Removed Director class