Beginning UI Restructuring

See title.