Cleanup required

[alexrd]

Need to reorganize the tools and scripts here and remove some of the older tools that aren't used anymore. This will make the codebase more readable.