Code Movement Description: Moved tools code into their own separate subdirectories Platforms tested: Linux, Kelgia