Merged ui and re-added other files