Prefixed all custom directives to aviod future collisions
Rewrote secondary controllers to match pattern of contentCtrl