file structure improved, no feature affected