diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
--- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
+++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
@@ -59,12 +59,12 @@
         SOURCE_CATEGORIES.put(SourceCategoryType.GRAILSAPP_UTILS, new SourceCategory("grails-app/utils", null, null));
         SOURCE_CATEGORIES.put(SourceCategoryType.GRAILSAPP_VIEWS, new SourceCategory("grails-app/views", null, null));
         SOURCE_CATEGORIES.put(SourceCategoryType.PLUGINS, new SourceCategory("plugins", null, null));
-        SOURCE_CATEGORIES.put(SourceCategoryType.TEST_INTEGRATION, new SourceCategory("test/integration", "create-integration-test", "Tests.groovy"));
-        SOURCE_CATEGORIES.put(SourceCategoryType.TEST_UNIT, new SourceCategory("test/unit", "create-unit-test", "Tests.groovy"));
+        SOURCE_CATEGORIES.put(SourceCategoryType.TEST_INTEGRATION, new SourceCategory("src/integration-test/groovy", "create-integration-test", "Spec.groovy"));
+        SOURCE_CATEGORIES.put(SourceCategoryType.TEST_UNIT, new SourceCategory("src/test/groovy", "create-unit-test", "Spec.groovy"));
         SOURCE_CATEGORIES.put(SourceCategoryType.SCRIPTS, new SourceCategory("scripts", "create-script", null));
-        SOURCE_CATEGORIES.put(SourceCategoryType.SRC_JAVA, new SourceCategory("src/java", null, null));
+        SOURCE_CATEGORIES.put(SourceCategoryType.SRC_JAVA, new SourceCategory("src/main/groovy", null, ".java"));
         SOURCE_CATEGORIES.put(SourceCategoryType.SRC_GWT, new SourceCategory("src/gwt", null, null));
-        SOURCE_CATEGORIES.put(SourceCategoryType.SRC_GROOVY, new SourceCategory("src/groovy", null, null));
+        SOURCE_CATEGORIES.put(SourceCategoryType.SRC_GROOVY, new SourceCategory("src/main/groovy", null, ".groovy"));
         SOURCE_CATEGORIES.put(SourceCategoryType.TEMPLATES, new SourceCategory("src/templates", "install-templates", null));
         SOURCE_CATEGORIES.put(SourceCategoryType.WEBAPP, new SourceCategory("web-app", null, null));
         SOURCE_CATEGORIES.put(SourceCategoryType.LIB, new SourceCategory("lib", null, null));