Moved some things around for better organization.
1 file changed