Split tools package array into three packages

This makes it easier to specify if you for example don't want the kmods
package on a machine while keeping the x package dynamic.
Style changes