Fix import after restructuration