Refactor UI implementation packages