Completed reorganizing to fix my OCD

Looks absolutely beautiful in Sublime Text, at least. I'm not sure how
the comments will appear to others in other coding environments.