Restructure

Modifications needed to support the changed directory structure of the argo NOC