Rearrange the terminal code to not have a cyclic dependency with the project