Move HTP to Utils