Changed package structure and added needed GUI classes.