Revert "Complete program redesign"

This reverts commit 4878d29f315d9399ffa146e9d716e8e50b0f3335.