Moved some stuff around in the power shell scripts.