Remove cyclic dependencies inside gui package