Added components, deleted extra classes