Regroup folders (services, directives, classes)