Insane name changes and Views moved to awt.