Reorganize dir structure