change file structure and add git rule