Restructured packages to reflect edu.indiana.soic.spidal