reorganised ui packages