Created general gui; package refactoring;