Moved components into own directory