new dir structure and naming