reorganize dir structures