Revert "First push of a complete overhaul of system."

This reverts commit dd38f2374ef3954791b6818734417ab52eddce3f.