File restructure + Admin UI work