Restructuring, somewhat.
Dunno why eclipse wants to do it this way, but ok.