Moved
Moved
New file
Rearrange ui code