Re-organizing our equipment