Moved some of the tools into different areas