Cleaned Code for Stage 2.

Stage 2 now has its own folder.
New stage has been added to make it easier to notice that the stage has
changed.

This took roughly 10 minutes.