Another clean up, moves gui into /eclipse/src