Removed the components packages, and cleaned up a whole mess of unnecessary generics.