modified dir structure