Move hitlist_api_messages to different module