Wildcard-ify ng file paths
Fix classing