Moved around a few components