Moved around several classes into related package names.