Remapped motors to correct ports and added module definitions