Removed class dependency from gui package to model package