Moving the UI classes to where they belong.