Added component library; continuing component cleanup