Moved components into correct file