Restructure Magpie
Merge branch 'master' of https://github.com/LabLayers/vhs-ap-compsci