Put things in one place. The other option is really bad. Not fixing it isn't an option.
Merge pull request #418 from code-dot-org/dont-be-lazy

Put things in one place.