improve: remove ui test, update structure