Adjust dir structure of imports