Moving Terminal module to extesions