re-organize the folder, keep the fold as simple as possible