Moved the gui package inside the client package