[PATCH 1/6] move header files in according directories