Added a ui package and moved stuff around.