move class into ui package