Added GUI code and removed default package