diff -r 708b435b6aca javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/Bundle.properties
--- a/javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/Bundle.properties	Mon Mar 09 12:00:17 2009 +0100
+++ b/javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/Bundle.properties	Fri Mar 13 09:23:07 2009 +0900
@@ -42,3 +42,55 @@
 OpenIDE-Module-Name=JavaFX Best Practices
 OpenIDE-Module-Short-Description=Best practices demo collection
 LBL_CreateProjectStep=Name and Location
+
+#
+Templates/Project/Samples/JavaFX=JavaFX
+#
+Templates/Project/Samples/JavaFX/Building_Blocks=Building Blocks
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Math=Math
+Templates/Project/Samples/JavaFX/Building_Blocks/Math/Arctangent=Arctangent
+Templates/Project/Samples/JavaFX/Building_Blocks/Math/Distance_1D=Distance 1D
+Templates/Project/Samples/JavaFX/Building_Blocks/Math/Distance_2D=Distance 2D
+Templates/Project/Samples/JavaFX/Building_Blocks/Math/Sine=Sine
+Templates/Project/Samples/JavaFX/Building_Blocks/Math/Sine_Wave=Sine Wave
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Color=Color
+Templates/Project/Samples/JavaFX/Building_Blocks/Color/Linear_Gradient=Linear Gradient
+Templates/Project/Samples/JavaFX/Building_Blocks/Color/Color_Wheel=Color Wheel
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Shapes=Shapes
+Templates/Project/Samples/JavaFX/Building_Blocks/Shapes/Points_and_Lines=Points and Lines
+Templates/Project/Samples/JavaFX/Building_Blocks/Shapes/Shape_Primitives=Shape Primitives
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Image=Image
+Templates/Project/Samples/JavaFX/Building_Blocks/Image/Displaying=Displaying
+Templates/Project/Samples/JavaFX/Building_Blocks/Image/Background_Image=Background Image
+Templates/Project/Samples/JavaFX/Building_Blocks/Image/Transparency=Transparency
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Transform=Transform
+Templates/Project/Samples/JavaFX/Building_Blocks/Transform/Translate=Translate
+Templates/Project/Samples/JavaFX/Building_Blocks/Transform/Scale=Scale
+Templates/Project/Samples/JavaFX/Building_Blocks/Transform/Rotate=Rotate
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Motion=Motion
+Templates/Project/Samples/JavaFX/Building_Blocks/Motion/Linear=Linear
+Templates/Project/Samples/JavaFX/Building_Blocks/Motion/Bouncy_Bubbles=Bouncy Bubbles
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Input=Input
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Mouse_1D=Mouse 1D
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Mouse_2D=Mouse 2D
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Mouse_Press=Mouse Press
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Easing=Easing
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Constrain=Constrain
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Storing_Input=Storing Input
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Milliseconds=Milliseconds
+Templates/Project/Samples/JavaFX/Building_Blocks/Input/Clock=Clock
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Simulation=Simulation
+Templates/Project/Samples/JavaFX/Building_Blocks/Simulation/Simple_Particle_System=Simple Particle System
+Templates/Project/Samples/JavaFX/Building_Blocks/Simulation/Smoke_Particle_System=Smoke Particle System
+Templates/Project/Samples/JavaFX/Building_Blocks/Simulation/Flocks=Flocks
+#
+Templates/Project/Samples/JavaFX/Building_Blocks/Game=Game
+Templates/Project/Samples/JavaFX/Building_Blocks/Game/Bounce=Bounce
diff -r 708b435b6aca javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/layer.xml
--- a/javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/layer.xml	Mon Mar 09 12:00:17 2009 +0100
+++ b/javafx.bestpractices/src/org/netbeans/modules/javafx/bestpractices/resources/layer.xml	Fri Mar 13 09:23:07 2009 +0900
@@ -280,8 +280,11 @@
         <folder name="Project">
             <folder name="Samples">
                 <folder name="JavaFX">
-                    <folder name="Building Blocks">
+                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
+                    <folder name="Building_Blocks">
+                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                         <folder name="Math">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                             <file name="Arctangent" url="../../../../../../demos/math/Arctangent.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
@@ -290,7 +293,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/math/Arctangent"/>
                             </file>
-                            <file name="Distance 1D" url="../../../../../../demos/math/Distance1D.fx">
+                            <file name="Distance_1D" url="../../../../../../demos/math/Distance1D.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -298,7 +301,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/math/Distance1D"/>
                             </file>
-                            <file name="Distance 2D" url="../../../../../../demos/math/Distance2D.fx">
+                            <file name="Distance_2D" url="../../../../../../demos/math/Distance2D.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -314,7 +317,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/math/Sine"/>
                             </file>
-                            <file name="Sine Wave" url="../../../../../../demos/math/SineWave.fx">
+                            <file name="Sine_Wave" url="../../../../../../demos/math/SineWave.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -324,7 +327,8 @@
                             </file>
                         </folder>
                         <folder name="Color">
-                            <file name="Linear Gradient" url="../../../../../../demos/color/GradientSample.fx">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
+                            <file name="Linear_Gradient" url="../../../../../../demos/color/GradientSample.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -332,7 +336,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/color/GradientSample"/>
                             </file>
-                            <file name="Color Wheel" url="../../../../../../demos/color/ColorWheel.fx">
+                            <file name="Color_Wheel" url="../../../../../../demos/color/ColorWheel.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -342,7 +346,8 @@
                             </file>
                         </folder>
                         <folder name="Shapes">
-                            <file name="Points and Lines" url="../../../../../../demos/shapes/PointsAndLines.fx">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
+                            <file name="Points_and_Lines" url="../../../../../../demos/shapes/PointsAndLines.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -350,7 +355,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/shapes/PointsAndLines"/>
                             </file>
-                            <file name="Shape Primitives" url="../../../../../../demos/shapes/ShapePrimitives.fx">
+                            <file name="Shape_Primitives" url="../../../../../../demos/shapes/ShapePrimitives.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -360,6 +365,7 @@
                             </file>
                         </folder>
                         <folder name="Image">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                             <file name="Displaying" url="../../../../../../demos/image/Displaying.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
@@ -368,7 +374,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/image/Displaying"/>
                             </file>
-                            <file name="Background Image" url="../../../../../../demos/image/BackgroundImage.fx">
+                            <file name="Background_Image" url="../../../../../../demos/image/BackgroundImage.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -386,6 +392,7 @@
                             </file>
                         </folder>
                         <folder name="Transform">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                             <file name="Translate" url="../../../../../../demos/transform/Translate.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
@@ -412,6 +419,7 @@
                             </file>
                         </folder>
                         <folder name="Motion">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                             <file name="Linear" url="../../../../../../demos/motion/Linear.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
@@ -420,7 +428,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/motion/Linear"/>
                             </file>
-                            <file name="Bouncy Bubbles" url="../../../../../../demos/motion/BouncyBubbles.fx">
+                            <file name="Bouncy_Bubbles" url="../../../../../../demos/motion/BouncyBubbles.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -430,7 +438,8 @@
                             </file>
                         </folder>
                         <folder name="Input">
-                            <file name="Mouse 1D" url="../../../../../../demos/input/Mouse1D.fx">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
+                            <file name="Mouse_1D" url="../../../../../../demos/input/Mouse1D.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -438,7 +447,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/input/Mouse1D"/>
                             </file>
-                            <file name="Mouse 2D" url="../../../../../../demos/input/Mouse2D.fx">
+                            <file name="Mouse_2D" url="../../../../../../demos/input/Mouse2D.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -446,7 +455,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/input/Mouse2D"/>
                             </file>
-                            <file name="Mouse Press" url="../../../../../../demos/input/MousePress.fx">
+                            <file name="Mouse_Press" url="../../../../../../demos/input/MousePress.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -470,7 +479,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/input/Constrain"/>
                             </file>
-                            <file name="Storing Input" url="../../../../../../demos/input/StoringInput.fx">
+                            <file name="Storing_Input" url="../../../../../../demos/input/StoringInput.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -496,7 +505,8 @@
                             </file>
                         </folder>
                         <folder name="Simulation">
-                            <file name="Simple Particle System" url="../../../../../../demos/particles/SimpleParticleSystem.fx">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
+                            <file name="Simple_Particle_System" url="../../../../../../demos/particles/SimpleParticleSystem.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -504,7 +514,7 @@
                                 <attr name="template" boolvalue="true"/>
                                 <attr name="file" stringvalue="demos/particles/SimpleParticleSystem"/>
                             </file>
-                            <file name="Smoke Particle System" url="../../../../../../demos/particles/SmokeParticleSystem.fx">
+                            <file name="Smoke_Particle_System" url="../../../../../../demos/particles/SmokeParticleSystem.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                                 <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.javafx.bestpractices.BestPracticesWizardIterator.createIterator"/>
@@ -522,6 +532,7 @@
                             </file>
                         </folder>
                         <folder name="Game">
+                            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>
                             <file name="Bounce" url="../../../../../../demos/game/Bounce.fx">
                                 <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javafx/dataloader/FX-filetype.png"/>
                                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.javafx.bestpractices.resources.Bundle"/>