Renames interface
Cleanup
Reorders some classes to better separate Swing from non-Swing
Improves null-returns