Moved some of the scripting files to match the namespaces they should be in