Moved some stuff around for organization.