Moving cupper directive in own directory
Moving toCollection filter in own directory
Updating references to directives and filters