Reorganization of main HDX code