Move all elements to .ui package