restructuring to allow for preprocessing
Merge branch 'master' of ssh://github.com/AuriqJames/AugurSense
restructuring