Added baseController, baseDirective etc.