Renaming

Took out the UIList stuff, make a separate file please because this is the one we will use for presentation.