Dir structure change. minor updates