Revert "Here are the final big changes!"

Reverts sundaisun/finals#19