move commands to the correct file...