Moved components into their own directory