reorganize dir structures
reorganize dir structures