rearange dir structure WIP