diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/CSharpEngine/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/CSharpEngine/CSharpScriptEngine.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/CSharpEngine/CSharpScriptEngine.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/CSharpEngine/CSharpScriptEngine.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/CSharpEngine/Examples/ExportRegionToLSL.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/CSharpEngine/Examples/ExportRegionToLSL.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/CSharpEngine/Examples/ExportRegionToLSL.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/CSharpEngine/Examples/ExportRegionToLSL.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JScriptEngine/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JScriptEngine/JScriptEngine.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JScriptEngine/JScriptEngine.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JScriptEngine/JScriptEngine.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/ClassInstance.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/ClassInstance.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/ClassInstance.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/ClassInstance.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/ClassRecord.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/ClassRecord.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/ClassRecord.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Heap.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Heap.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Heap.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Heap.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Interpreter.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Interpreter.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/MainMemory.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/MainMemory.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/MainMemory.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/MainMemory.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/MethodMemory.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/MethodMemory.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/MethodMemory.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/MethodMemory.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Object.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Object.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Object.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Object.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/OpCodes.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/OpCodes.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/OpCodes.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/OpCodes.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Stack.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Stack.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Stack.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Stack.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/StackFrame.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/StackFrame.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/StackFrame.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/StackFrame.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Thread.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Thread.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JVM/Thread.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JVM/Thread.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JavaEngine.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JavaEngine.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/JavaEngine.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/JavaEngine.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/OpenSimJVM.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/OpenSimJVM.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/OpenSimJVM.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/ArrayReference.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/ArrayReference.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/ArrayReference.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/ArrayReference.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/BaseType.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/BaseType.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/BaseType.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/ObjectReference.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/ObjectReference.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/ObjectReference.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/ObjectReference.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/Common.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/Common.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/Common.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/Common.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/Engine.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/Engine.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/Engine.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/Engine.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/IL_common_functions.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_Interface.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_BuiltIn_Commands_TestImplementation.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_CLRInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_CLRInterface.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_CLRInterface.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_CLRInterface.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSL_OPCODE_IL_processor.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Enums.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Enums.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Enums.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Enums.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Parser.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Parser.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Parser.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Parser.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Struct.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Struct.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLHandler/LSO_Struct.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLHandler/LSO_Struct.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLScript.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLScript.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLScriptEngine.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScriptEngine.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Engines/LSLEngine/LSLScriptEngine.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScriptEngine.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/Script.cs b/OpenSim/Region/Environment/Scenes/Scripting/Script.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/Script.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/Script.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/ScriptAPI.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptAPI.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/ScriptAPI.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/ScriptAPI.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptInfo.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/ScriptInfo.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/ScriptInfo.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/ScriptInterpretedAPI.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/ScriptInterpretedEvents.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedEvents.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/ScriptInterpretedEvents.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedEvents.cs
diff --git a/OpenSim/Region/Environment/Scenes/_scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptManager.cs
similarity index 100%
rename from OpenSim/Region/Environment/Scenes/_scripting/ScriptManager.cs
rename to OpenSim/Region/Environment/Scenes/Scripting/ScriptManager.cs