Some more modifications in dir structure.