removed apps, added components; updated to support Component