Directive cleanup
Placing scope where it needs to be by seperating parent-child directives