Finished renaming logic.ui to logic.model