Cleanups in tui. moved main file out of model package