directory structure fixes

fix after directory structure revamp