Changed package hierarhy, started graphical version