Restructured the code a bit.
This tag has no release notes.