New structure & Add new Ui

New structure & Add new Ui