Updated to mtch new directory structure as well as some additional shuffeling around and additional checks