restructure, add debug into source folder